From 6887ef89695dc1d588e621370b23aa6237af10f7 Mon Sep 17 00:00:00 2001
From: Eric Kuck <eric@bluelinelabs.com>
Date: Sun, 8 Jul 2018 15:42:48 -0500
Subject: Request VPN permissions on activation

Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
---
 app/src/main/res/layout/tunnel_detail_fragment.xml | 8 +++++---
 app/src/main/res/layout/tunnel_list_item.xml       | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'app/src/main/res')

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,12 +5,14 @@
 
     <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>
-- 
cgit v1.2.3-59-g8ed1b