From 64afae2e2ee8c368547b13da5a5df43b18af7c1f Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 12 Sep 2016 09:57:22 +0200
Subject: Remark that Always On VPN could cancel the confirmation dialog

---
 build.gradle                                        | 2 +-
 main/src/main/java/de/blinkt/openvpn/LaunchVPN.java | 3 +++
 main/src/main/res/values/strings.xml                | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 462f6e89..a7407184 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-beta3'
+        classpath 'com.android.tools.build:gradle:2.2.0-rc1'
     }
 }
 
diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index 1df4b0e4..38549a6c 100644
--- a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -210,6 +210,9 @@ public class LaunchVPN extends Activity {
                 VpnStatus.updateStateString("USER_VPN_PERMISSION_CANCELLED", "", R.string.state_user_vpn_permission_cancelled,
                         ConnectionStatus.LEVEL_NOTCONNECTED);
 
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                    VpnStatus.logError(R.string.nought_alwayson_warning);
+
                 finish();
             }
         }
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index af92f3c9..d9c11a8b 100755
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -415,4 +415,5 @@
     <string name="connectretrymaxmessage">Enter the maximum time between connection attempts. OpenVPN will slowly raise its waiting time after an unsuccessful connection attempt up to this value. Defaults to 300s.</string>
     <string name="connectretrymaxtitle">Maximum time between connection attempts</string>
     <string name="state_waitconnectretry">Waiting %ss seconds between connection attempt</string>
+    <string name="nought_alwayson_warning"><![CDATA[If you did not get a VPN confirmation dialog, you have \"Always on VPN\" enabled for another app. In that case only that app is allowed to connect to a VPN. Check under Settings-> Networks more .. -> VPNS]]></string>
 </resources>
-- 
cgit v1.2.3