diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-03-08 16:46:07 +0800 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-03-09 00:19:42 +0800 |
| commit | 4905185e6121471f8c15d4ac59623323284135e5 (patch) | |
| tree | bbbaa47a67158eef6dabfb6a9ed59cafe4b94d40 /app/src/main/res/layout | |
| parent | 09904305136adec00fae06f84e299b2df9a580c9 (diff) | |
backend: do not depend on anything except config
This is likely broken but should make for a good starting point.
It also should hopefully handle stopping tunnels before starting new
ones, in the case of the GoBackend. Again, untested.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/tunnel_detail_fragment.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/tunnel_list_fragment.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/tunnel_list_item.xml | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/app/src/main/res/layout/tunnel_detail_fragment.xml b/app/src/main/res/layout/tunnel_detail_fragment.xml index 40a79eb7..463f8b80 100644 --- a/app/src/main/res/layout/tunnel_detail_fragment.xml +++ b/app/src/main/res/layout/tunnel_detail_fragment.xml @@ -5,7 +5,7 @@ <data> - <import type="com.wireguard.android.model.Tunnel.State" /> + <import type="com.wireguard.android.backend.Tunnel.State" /> <import type="com.wireguard.android.util.ClipboardUtils" /> @@ -15,7 +15,7 @@ <variable name="tunnel" - type="com.wireguard.android.model.Tunnel" /> + type="com.wireguard.android.model.ObservableTunnel" /> <variable name="config" diff --git a/app/src/main/res/layout/tunnel_list_fragment.xml b/app/src/main/res/layout/tunnel_list_fragment.xml index c4247019..c8144dbb 100644 --- a/app/src/main/res/layout/tunnel_list_fragment.xml +++ b/app/src/main/res/layout/tunnel_list_fragment.xml @@ -5,7 +5,7 @@ <data> - <import type="com.wireguard.android.model.Tunnel" /> + <import type="com.wireguard.android.model.ObservableTunnel" /> <variable name="fragment" @@ -17,7 +17,7 @@ <variable name="tunnels" - type="com.wireguard.android.util.ObservableKeyedList<String, Tunnel>" /> + type="com.wireguard.android.util.ObservableKeyedList<String, ObservableTunnel>" /> </data> <androidx.coordinatorlayout.widget.CoordinatorLayout diff --git a/app/src/main/res/layout/tunnel_list_item.xml b/app/src/main/res/layout/tunnel_list_item.xml index 1cca9453..04c0f51e 100644 --- a/app/src/main/res/layout/tunnel_list_item.xml +++ b/app/src/main/res/layout/tunnel_list_item.xml @@ -5,13 +5,13 @@ <data> - <import type="com.wireguard.android.model.Tunnel" /> + <import type="com.wireguard.android.model.ObservableTunnel" /> - <import type="com.wireguard.android.model.Tunnel.State" /> + <import type="com.wireguard.android.backend.Tunnel.State" /> <variable name="collection" - type="com.wireguard.android.util.ObservableKeyedList<String, Tunnel>" /> + type="com.wireguard.android.util.ObservableKeyedList<String, ObservableTunnel>" /> <variable name="key" @@ -19,7 +19,7 @@ <variable name="item" - type="com.wireguard.android.model.Tunnel" /> + type="com.wireguard.android.model.ObservableTunnel" /> <variable name="fragment" |