summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2016-09-12 09:57:22 +0200
committerArne Schwabe <arne@rfc2549.org>2016-09-12 09:57:22 +0200
commit64afae2e2ee8c368547b13da5a5df43b18af7c1f (patch)
tree9c31bc2634c9f4cada4dd800f2844bb99ebc0611 /main
parentb3fcbc10f64cc3059eac8f2bc261a2204381655b (diff)
Remark that Always On VPN could cancel the confirmation dialog
Diffstat (limited to 'main')
-rw-r--r--main/src/main/java/de/blinkt/openvpn/LaunchVPN.java3
-rwxr-xr-xmain/src/main/res/values/strings.xml1
2 files changed, 4 insertions, 0 deletions
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>