Working on Android 5.

Beware! https://code.google.com/p/android/issues/detail?id=80074: Wrong VpnService.prepare() behavior after re-installation of the VPN app on Android 5.0

"The following steps will cause incorrect behavior of the VpnService.prepare():

1. Establish VPN connection using any VPN app. VpnService.prepare() will return an intent for the "Connection request" system activity. Once user accepts it, VPN connection can be established successfully.
2. Uninstall VPN app.
3. Re-install the same VPN app.
4. Now VpnService.prepare() returns null, as if the VPN service has been already prepared.
5. Now VpnService.protect() returns false and VPN connection fails.

Device reboot is needed in order to be able to establish VPN connection again."

1 files changed, 10 insertions, 11 deletions

diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index f5f27247..f1cb84d6 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -63,12 +63,11 @@ public class ProviderAPI extends IntentService {
     ;
 
     final public static int
-    CUSTOM_PROVIDER_ADDED = 0,
-    SRP_AUTHENTICATION_SUCCESSFUL = 3,
-    SRP_AUTHENTICATION_FAILED = 4,
-    SRP_REGISTRATION_SUCCESSFUL = 5,
-    SRP_REGISTRATION_FAILED = 6,
-    LOGOUT_SUCCESSFUL = 7,
+    SUCCESSFUL_LOGIN = 3,
+    FAILED_LOGIN = 4,
+    SUCCESSFUL_SIGNUP = 5,
+    FAILED_SIGNUP = 6,
+    SUCCESSFUL_LOGOUT = 7,
     LOGOUT_FAILED = 8,
     CORRECTLY_DOWNLOADED_CERTIFICATE = 9,
     INCORRECTLY_DOWNLOADED_CERTIFICATE = 10,
@@ -140,20 +139,20 @@ public class ProviderAPI extends IntentService {
 		} else if (action.equalsIgnoreCase(SRP_REGISTER)) {
 		    Bundle result = tryToRegister(parameters);
 		    if(result.getBoolean(RESULT_KEY)) {
-			receiver.send(SRP_REGISTRATION_SUCCESSFUL, result);
+			receiver.send(SUCCESSFUL_SIGNUP, result);
 		    } else {
-			receiver.send(SRP_REGISTRATION_FAILED, result);
+			receiver.send(FAILED_SIGNUP, result);
 		    }
 		} else if (action.equalsIgnoreCase(SRP_AUTH)) {
 		    Bundle result = tryToAuthenticate(parameters);
 		    if(result.getBoolean(RESULT_KEY)) {
-			receiver.send(SRP_AUTHENTICATION_SUCCESSFUL, result);
+			receiver.send(SUCCESSFUL_LOGIN, result);
 		    } else {
-			receiver.send(SRP_AUTHENTICATION_FAILED, result);
+			receiver.send(FAILED_LOGIN, result);
 		    }
 		} else if (action.equalsIgnoreCase(LOG_OUT)) {
 				if(logOut()) {
-					receiver.send(LOGOUT_SUCCESSFUL, Bundle.EMPTY);
+					receiver.send(SUCCESSFUL_LOGOUT, Bundle.EMPTY);
 				} else {
 					receiver.send(LOGOUT_FAILED, Bundle.EMPTY);
 				}