summaryrefslogtreecommitdiffhomepage
path: root/app/src/main/res
diff options
context:
space:
mode:
authorEric Kuck <eric@bluelinelabs.com>2018-07-08 15:42:48 -0500
committerJason A. Donenfeld <Jason@zx2c4.com>2018-07-09 17:08:41 +0200
commitd7ea078cdf323946cea8bfcf8762f6a5a81f455c (patch)
tree290b1a2963dd92493f935c307664490e1021cd3a /app/src/main/res
parentd50e0f5fb9d60992d65a818a8af1cc20e878e312 (diff)
Request VPN permissions on activation
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/tunnel_detail_fragment.xml8
-rw-r--r--app/src/main/res/layout/tunnel_list_item.xml8
2 files changed, 10 insertions, 6 deletions
diff --git a/app/src/main/res/layout/tunnel_detail_fragment.xml b/app/src/main/res/layout/tunnel_detail_fragment.xml
index 3fa3c757..ed43cc01 100644
--- a/app/src/main/res/layout/tunnel_detail_fragment.xml
+++ b/app/src/main/res/layout/tunnel_detail_fragment.xml
@@ -5,13 +5,15 @@
<data>
- <import type="com.wireguard.android.fragment.TunnelController" />
-
<import type="com.wireguard.android.model.Tunnel.State" />
<import type="com.wireguard.android.util.ClipboardUtils" />
<variable
+ name="fragment"
+ type="com.wireguard.android.fragment.TunnelDetailFragment" />
+
+ <variable
name="tunnel"
type="com.wireguard.android.model.Tunnel" />
@@ -63,7 +65,7 @@
android:layout_alignBaseline="@+id/interface_title"
android:layout_alignParentEnd="true"
app:checked="@{tunnel.state == State.UP}"
- app:onBeforeCheckedChanged="@{TunnelController::setTunnelState}" />
+ app:onBeforeCheckedChanged="@{fragment::setTunnelState}" />
<TextView
android:id="@+id/interface_name_label"
diff --git a/app/src/main/res/layout/tunnel_list_item.xml b/app/src/main/res/layout/tunnel_list_item.xml
index 7fbd61f7..f0a5b88d 100644
--- a/app/src/main/res/layout/tunnel_list_item.xml
+++ b/app/src/main/res/layout/tunnel_list_item.xml
@@ -4,8 +4,6 @@
<data>
- <import type="com.wireguard.android.fragment.TunnelController" />
-
<import type="com.wireguard.android.model.Tunnel" />
<import type="com.wireguard.android.model.Tunnel.State" />
@@ -21,6 +19,10 @@
<variable
name="item"
type="com.wireguard.android.model.Tunnel" />
+
+ <variable
+ name="fragment"
+ type="com.wireguard.android.fragment.TunnelListFragment" />
</data>
<RelativeLayout
@@ -49,6 +51,6 @@
android:layout_alignBaseline="@+id/tunnel_name"
android:layout_alignParentEnd="true"
app:checked="@{item.state == State.UP}"
- app:onBeforeCheckedChanged="@{TunnelController::setTunnelState}" />
+ app:onBeforeCheckedChanged="@{fragment::setTunnelState}" />
</RelativeLayout>
</layout>