Merge branch 'bug/Restart-connection-if-authentication-fails-#6229' into develop

8 files changed, 62 insertions, 60 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 9207ff84..9c1d5b4e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'android'
-import org.ajoberstar.grgit.*
+//import org.ajoberstar.grgit.*
 
 android {
   compileSdkVersion 19
@@ -58,7 +58,7 @@ def processFileInplace(file, Closure processText) {
 
 task checkoutStrippedIcsOpenVPN ( type: Copy ) {
   //FIXME Checkout ics-openvpn-stripped from branch "ics-openvpn-upstream"
-  grgit = Grgit.open(project.file('../'))
+  //grgit = Grgit.open(project.file('../'))
   
   from '../../bitmask_android_tmp/ics-openvpn-stripped'
   into '../ics-openvpn-stripped'
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index 6445a599..07e0e2fe 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -96,7 +96,7 @@ public class ProviderAPI extends IntentService {
     ERRORS = "errors",
     UPDATE_PROGRESSBAR = "update_progressbar",
     CURRENT_PROGRESS = "current_progress",
-    TAG = "provider_api_tag"
+	TAG = ProviderAPI.class.getSimpleName();
     ;
 
     final public static int
@@ -903,7 +903,6 @@ public class ProviderAPI extends IntentService {
     private boolean updateVpnCertificate() {
 	getNewCert();
 
-	preferences.edit().putInt(EIP.PARSED_SERIAL, 0).commit();
 	Intent updateEIP = new Intent(getApplicationContext(), EIP.class);
 	updateEIP.setAction(EIP.ACTION_UPDATE_EIP_SERVICE);
 	startService(updateEIP);
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index d80755aa..3ae1d81a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -213,31 +213,35 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		}
 	}
 
-	@Override
-	public boolean onPrepareOptionsMenu(Menu menu) {
-		JSONObject provider_json;
-		try {
-			provider_json = new JSONObject(preferences.getString(Provider.KEY, ""));
-			JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE);
-			boolean authed_eip = preferences.getBoolean(EIP.AUTHED_EIP, false);
-			boolean allow_registered_eip = service_description.getBoolean(Provider.ALLOW_REGISTRATION);
-			preferences.edit().putBoolean(EIP.ALLOWED_REGISTERED, allow_registered_eip);
-			if(allow_registered_eip) {
-				if(authed_eip) {
-					menu.findItem(R.id.login_button).setVisible(false);
-					menu.findItem(R.id.logout_button).setVisible(true);
-				} else {
-					menu.findItem(R.id.login_button).setVisible(true);
-					menu.findItem(R.id.logout_button).setVisible(false);
-				}
-				menu.findItem(R.id.signup_button).setVisible(true);
-			}
-		} catch (JSONException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} 
-		return true;
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+	JSONObject provider_json;
+	try {
+	    String provider_json_string = preferences.getString(Provider.KEY, "");
+	    if(provider_json_string.isEmpty() == false) {
+		provider_json = new JSONObject(provider_json_string);
+		JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE);
+		boolean authed_eip = preferences.getBoolean(EIP.AUTHED_EIP, false);
+		boolean allow_registered_eip = service_description.getBoolean(Provider.ALLOW_REGISTRATION);
+		preferences.edit().putBoolean(EIP.ALLOWED_REGISTERED, allow_registered_eip);
+		
+		if(allow_registered_eip) {
+		    if(authed_eip) {
+			menu.findItem(R.id.login_button).setVisible(false);
+			menu.findItem(R.id.logout_button).setVisible(true);
+		    } else {
+			menu.findItem(R.id.login_button).setVisible(true);
+			menu.findItem(R.id.logout_button).setVisible(false);
+		    }
+		    menu.findItem(R.id.signup_button).setVisible(true);
+		}
+	    }
+	} catch (JSONException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
 	}
+	return true;
+    }
 	
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
@@ -533,16 +537,13 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	}
 	
     private void eipStop(){
-	// TODO validate "action"...how do we get the list of intent-filters for a class via Android API?
-	Intent eip_intent = new Intent(this, EIP.class);
-	eip_intent.setAction(EIP.ACTION_STOP_EIP);
-	startService(eip_intent);		
+	EipServiceFragment eipFragment = (EipServiceFragment) getFragmentManager().findFragmentByTag(EipServiceFragment.TAG);
+	eipFragment.stopEIP();
     }
 
     private void eipStart() {
-	Intent eip_intent = new Intent(this, EIP.class);
-	eip_intent.setAction(EIP.ACTION_START_EIP);
-	startService(eip_intent);	
+	EipServiceFragment eipFragment = (EipServiceFragment) getFragmentManager().findFragmentByTag(EipServiceFragment.TAG);
+	eipFragment.startEipFromScratch();
     }
 
     protected void showProgressBar() {
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index 1b34ac21..cf02f32f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -87,7 +87,7 @@ public final class EIP extends IntentService {
 	public final static String SERVICE_API_PATH = "config/eip-service.json";
 	public final static String RECEIVER_TAG = "receiverTag";
 	public final static String REQUEST_TAG = "requestTag";
-	public final static String TAG = "se.leap.bitmaskclient.EIP";
+    public final static String TAG = EIP.class.getSimpleName();
 
     public final static SimpleDateFormat certificate_date_format = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US);
     
@@ -113,8 +113,9 @@ public final class EIP extends IntentService {
 		super.onCreate();
 		
 		context = getApplicationContext();
-		
-		updateEIPService();
+
+		// Log.d(TAG, "Update EIP Service onCreate EIP");
+		// updateEIPService();
 	}
 	
 	@Override
@@ -130,7 +131,7 @@ public final class EIP extends IntentService {
     protected void onHandleIntent(Intent intent) {
 	String action = intent.getAction();
 	mReceiver = intent.getParcelableExtra(RECEIVER_TAG);
-		
+	
 	if ( action == ACTION_START_EIP )
 	    startEIP();
 	else if ( action == ACTION_STOP_EIP )
@@ -319,8 +320,11 @@ public final class EIP extends IntentService {
 	 */
 	private void updateEIPService() {
 		try {
-			eipDefinition = new JSONObject(getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getString(KEY, ""));
-			parsedEipSerial = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getInt(PARSED_SERIAL, 0);
+		    String eip_definition_string = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getString(KEY, "");
+		    if(eip_definition_string.isEmpty() == false) {
+			eipDefinition = new JSONObject(eip_definition_string);
+		    }
+		    parsedEipSerial = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).getInt(PARSED_SERIAL, 0);
 		} catch (JSONException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -328,16 +332,14 @@ public final class EIP extends IntentService {
 		if(parsedEipSerial == 0) {
 		    deleteAllVpnProfiles();
 		}
-		if (eipDefinition != null && eipDefinition.optInt("serial") > parsedEipSerial)
+		if (eipDefinition != null && eipDefinition.optInt("serial") >= parsedEipSerial)
 			updateGateways();
 	}
 
     private void deleteAllVpnProfiles() {
 	ProfileManager vpl = ProfileManager.getInstance(context);
-	VpnProfile[] profiles = (VpnProfile[]) vpl.getProfiles().toArray(new VpnProfile[vpl.getProfiles().size()]);
-	for (int current_profile = 0; current_profile < profiles.length; current_profile++){
-	    vpl.removeProfile(context, profiles[current_profile]);
-	}
+	Collection<VpnProfile> profiles = vpl.getProfiles();
+	profiles.removeAll(profiles);
     }
 	
 	/**
@@ -347,7 +349,6 @@ public final class EIP extends IntentService {
 	 */
 	private void updateGateways(){
 		JSONArray gatewaysDefined = null;
-		
 		try {
 			gatewaysDefined = eipDefinition.getJSONArray("gateways");		
 			for ( int i=0 ; i < gatewaysDefined.length(); i++ ){			
@@ -361,7 +362,6 @@ public final class EIP extends IntentService {
 		    // TODO Auto-generated catch block
 		    e.printStackTrace();
 		}
-		
 		getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE).edit().putInt(PARSED_SERIAL, eipDefinition.optInt(Provider.API_RETURN_SERIAL)).commit();
 	}
 
@@ -484,6 +484,7 @@ public final class EIP extends IntentService {
 				cp.parseConfig(new StringReader(certSecretFromSharedPreferences()));
 				cp.parseConfig(new StringReader("remote-cert-tls server"));
 				cp.parseConfig(new StringReader("persist-tun"));
+				cp.parseConfig(new StringReader("auth-retry nointeract"));
 				VpnProfile vp = cp.convertProfile();
 				//vp.mAuthenticationType=VpnProfile.TYPE_STATICKEYS;
 				mVpnProfile = vp;
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
index 57e009dc..a7d68198 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
@@ -195,7 +195,7 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 	eipCommand(EIP.ACTION_START_EIP);
     }
 
-    private void stopEIP() {
+    protected void stopEIP() {
 	EIP.mIsStarting = false;
 	View eipProgressBar = getActivity().findViewById(R.id.eipProgress);
 	if(eipProgressBar != null)
@@ -236,7 +236,8 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 	} else if(justDecidedOnDisconnect && level == ConnectionStatus.LEVEL_CONNECTED) {
 	    EIP.lastConnectionStatusLevel = ConnectionStatus.LEVEL_NOTCONNECTED;
 	    updateState(state, logmessage, localizedResId, level);
-	}
+	} // else if(isNewLevel || level == ConnectionStatus.LEVEL_AUTH_FAILED)
+	  //   handleNewState(state, logmessage, localizedResId, level);
     }
 
     private void handleNewState(final String state, final String logmessage, final int localizedResId, final ConnectionStatus level) {
@@ -248,6 +249,8 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
 	    setNoServerReplyUI(localizedResId, logmessage);
 	else if (level == ConnectionStatus.LEVEL_CONNECTING_SERVER_REPLIED)
 	    setServerReplyUI(state, localizedResId, logmessage);
+	// else if (level == ConnectionStatus.LEVEL_AUTH_FAILED)
+	//     handleSwitchOn();
     }
 
     private boolean isDisconnectedLevel(final ConnectionStatus level) {
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index 189289ec..749457e4 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -95,7 +95,7 @@ public class ProviderAPI extends IntentService {
     ERRORS = "errors",
     UPDATE_PROGRESSBAR = "update_progressbar",
     CURRENT_PROGRESS = "current_progress",
-    TAG = "provider_api_tag"
+	TAG = ProviderAPI.class.getSimpleName();
     ;
 
     final public static int
@@ -897,7 +897,6 @@ public class ProviderAPI extends IntentService {
     private boolean updateVpnCertificate() {
 	getNewCert();
 
-	preferences.edit().putInt(EIP.PARSED_SERIAL, 0).commit();
 	Intent updateEIP = new Intent(getApplicationContext(), EIP.class);
 	updateEIP.setAction(EIP.ACTION_UPDATE_EIP_SERVICE);
 	startService(updateEIP);
@@ -919,7 +918,6 @@ public class ProviderAPI extends IntentService {
 			URL new_cert_string_url = new URL(provider_main_url + "/" + provider_json.getString(Provider.API_VERSION) + "/" + EIP.CERTIFICATE);
 
 			String cert_string = downloadWithProviderCA(new_cert_string_url.toString());
-
 			if(!cert_string.isEmpty()) {
 				if(ConfigHelper.checkErroneousDownload(cert_string)) {
 					String reason_to_fail = provider_json.getString(ERRORS);
@@ -940,12 +938,12 @@ public class ProviderAPI extends IntentService {
 						}
 					}
 					try {
-						RSAPrivateKey keyCert = ConfigHelper.parseRsaKeyFromString(keyString);
-						keyString = Base64.encodeToString( keyCert.getEncoded(), Base64.DEFAULT );
+						RSAPrivateKey key = ConfigHelper.parseRsaKeyFromString(keyString);
+						keyString = Base64.encodeToString(key.getEncoded(), Base64.DEFAULT);
 						preferences.edit().putString(EIP.PRIVATE_KEY, "-----BEGIN RSA PRIVATE KEY-----\n"+keyString+"-----END RSA PRIVATE KEY-----").commit();
 
-						X509Certificate certCert = ConfigHelper.parseX509CertificateFromString(certificateString);
-						certificateString = Base64.encodeToString( certCert.getEncoded(), Base64.DEFAULT);
+						X509Certificate certificate = ConfigHelper.parseX509CertificateFromString(certificateString);
+						certificateString = Base64.encodeToString(certificate.getEncoded(), Base64.DEFAULT);
 						preferences.edit().putString(EIP.CERTIFICATE, "-----BEGIN CERTIFICATE-----\n"+certificateString+"-----END CERTIFICATE-----").commit();
 						preferences.edit().putString(EIP.DATE_FROM_CERTIFICATE, EIP.certificate_date_format.format(Calendar.getInstance().getTime())).commit();
 						return true;
diff --git a/build.gradle b/build.gradle
index 6888c764..1d87374b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.11.+'
+    classpath 'com.android.tools.build:gradle:0.14.0'
     classpath 'org.ajoberstar:gradle-git:0.10+'
   }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ef4e1846..170d65de 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 09 16:47:31 CEST 2014
+#Tue Nov 04 16:20:08 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip