android: Show an error if VPN fails due to lock down mode in Android 4.2

diff --git a/src/frontends/android/res/values-de/strings.xml b/src/frontends/android/res/values-de/strings.xml
index a04da7208f7b56a3bacc7b43bea98c41d11875be..bb4cf5d3ae9ceac66664e32c9b89730ab12f9ede 100644 (file)
--- a/src/frontends/android/res/values-de/strings.xml
+++ b/src/frontends/android/res/values-de/strings.xml
@@ -25,6 +25,7 @@
     <string name="search">Suchen</string>
     <string name="vpn_not_supported_title">VPN nicht unterstützt</string>
     <string name="vpn_not_supported">Ihr Gerät unterstützt keine VPN Anwendungen.\nBitte kontaktieren Sie den Hersteller.</string>
+    <string name="vpn_not_supported_during_lockdown">VPN Verbindungen sind nicht möglich im abgeriegelten Modus.</string>
     <string name="loading">Laden&#8230;</string>
 
     <!-- Log view -->

diff --git a/src/frontends/android/res/values-pl/strings.xml b/src/frontends/android/res/values-pl/strings.xml
index 54f4259aefd31431b86923002fdad03a0dbafa68..58d158b8edc05c98cebca5ca65e2adaf7cc91131 100644 (file)
--- a/src/frontends/android/res/values-pl/strings.xml
+++ b/src/frontends/android/res/values-pl/strings.xml
@@ -27,6 +27,7 @@
     <string name="search">Szukaj</string>
     <string name="vpn_not_supported_title">Nie obsługiwany VPN</string>
     <string name="vpn_not_supported">Urządzenie nie obsługuje aplikacji VPN.\nProszę skontaktować się z producentem.</string>
+    <string name="vpn_not_supported_during_lockdown">Polączenia nie sa możliwe w trybie zamkniętym</string>
     <string name="loading">Wczytywanie&#8230;</string>
 
     <!-- Log view -->

diff --git a/src/frontends/android/res/values/strings.xml b/src/frontends/android/res/values/strings.xml
index 3e4b746fd55cbd4e04059404624f6e30a556ea7a..4b332348da9e293cc9125760fcaf1c060a11269f 100644 (file)
--- a/src/frontends/android/res/values/strings.xml
+++ b/src/frontends/android/res/values/strings.xml
@@ -25,6 +25,7 @@
     <string name="search">Search</string>
     <string name="vpn_not_supported_title">VPN not supported</string>
     <string name="vpn_not_supported">Your device does not support VPN applications.\nPlease contact the manufacturer.</string>
+    <string name="vpn_not_supported_during_lockdown">VPN connections are not supported in lockdown mode.</string>
     <string name="loading">Loading&#8230;</string>
 
     <!-- Log view -->

diff --git a/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
index 77ab56306598981d84594f3f2a8db74d05623b20..4ccf7d3145821dddb41f0e0238bcfc372a324eca 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
@@ -95,7 +95,17 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen
         */
        protected void prepareVpnService(Bundle profileInfo)
        {
-               Intent intent = VpnService.prepare(this);
+               Intent intent;
+               try
+               {
+                       intent = VpnService.prepare(this);
+               }
+               catch (IllegalStateException ex)
+               {
+                       /* this happens if the always-on VPN feature (Android 4.2+) is activated */
+                       VpnNotSupportedError.showWithMessage(this, R.string.vpn_not_supported_during_lockdown);
+                       return;
+               }
                /* store profile info until the user grants us permission */
                mProfileInfo = profileInfo;
                if (intent != null)