From e54f0cf39cce1c27b7baca77d777c7c271e4d108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 4 Nov 2014 00:20:31 +0100
Subject: Don't update eip service oncreate eip.

Reuse EipServiceFragment's stopEip and startEipFromScratch in Dashboard.
---
 app/src/main/java/se/leap/bitmaskclient/EIP.java | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/EIP.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index 1b34ac21..a2a06fbd 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();
 	}
 
-- 
cgit v1.2.3


From a137eccdde9349dc52b29fdadcb44cf317465c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 4 Nov 2014 18:46:27 +0100
Subject: Gradle 2.1 and retry connection on auth-failure

---
 app/src/main/java/se/leap/bitmaskclient/EIP.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/java/se/leap/bitmaskclient/EIP.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index a2a06fbd..cf02f32f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -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;
-- 
cgit v1.2.3