Merge branch 'release-0.5.4' into develop

4 files changed, 58 insertions, 26 deletions

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
index 8ddfbc57..229c3452 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -2,7 +2,7 @@ package se.leap.bitmaskclient.test;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.widget.ListView;
-import com.jayway.android.robotium.solo.Solo;
+import com.robotium.solo.Solo;
 import java.io.IOException;
 import se.leap.bitmaskclient.AboutActivity;
 import se.leap.bitmaskclient.ConfigurationWizard;
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
index bbc3e97d..fdf4f135 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
@@ -7,7 +7,9 @@ import android.content.IntentFilter;
 import android.provider.Settings;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
-import com.jayway.android.robotium.solo.Solo;
+import com.robotium.solo.Solo;
+
+import de.blinkt.openvpn.activities.DisconnectVPN;
 import se.leap.bitmaskclient.ConfigurationWizard;
 import se.leap.bitmaskclient.Dashboard;
 import se.leap.bitmaskclient.R;
@@ -38,28 +40,58 @@ public class testDashboard extends ActivityInstrumentationTestCase2<Dashboard> {
 	 * I cannot automate that dialog.
 	 */
 	public void testOnOffOpenVpn() {
-		solo.clickOnView(solo.getView(R.id.eipSwitch));
-		if(!solo.waitForText(getActivity().getString(R.string.eip_status_start_pending)))
-			fail();
-		if(!solo.waitForText(getActivity().getString(R.string.state_auth)))
-			fail();
-		if(!solo.waitForText(getActivity().getString(R.string.eip_state_connected), 1, 30*1000))
-			fail();
-		
-		solo.clickOnView(solo.getView(R.id.eipSwitch));
-		if(!solo.waitForText(getActivity().getString(R.string.eip_state_not_connected)))
-		    fail();
-		
-		/*ConnectionManager.setMobileDataEnabled(false, solo.getCurrentActivity().getApplicationContext());
-		
-		solo.clickOnView(solo.getView(R.id.eipSwitch));
-		if(!solo.waitForText(getActivity().getString(R.string.eip_status_start_pending)))
-			fail();
-		if(!solo.waitForText(getActivity().getString(R.string.state_nonetwork)))
-			fail();
-		*/
+	    solo.clickOnView(solo.getView(R.id.eipSwitch));
+	    testEipTurningOn();
+	    
+	    solo.clickOnView(solo.getView(R.id.eipSwitch));
+	    testEipTurningOff();
+	    
+	    solo.clickOnView(solo.getView(R.id.eipSwitch));
+	    testEipTurningOn();
+	    
+	    solo.clickOnView(solo.getView(R.id.eipSwitch));
+	    testEipTurningOff();
+	    
+	    solo.clickOnView(solo.getView(R.id.eipSwitch));
+	    testEipTurningOn();
+	    
+	    solo.clickOnView(solo.getView(R.id.eipSwitch));
+	    testEipTurningOff();
+
+	    solo.clickOnView(solo.getView(R.id.eipSwitch));
+	    testEipTurningOn();
+	    
+	    testEipIsOnNoNetwork();
+	    
 	}
-	
+
+    private void testEipTurningOn() {
+	if(!solo.waitForText(getActivity().getString(R.string.state_auth)))
+	    fail();
+	if(!solo.waitForText(getActivity().getString(R.string.eip_state_connected), 1, 30*1000))
+	    fail();
+	solo.sleep(2*1000);
+    }
+
+    private void testEipTurningOff() {
+	sayOkToDisconnect();
+	if(!solo.waitForText(getActivity().getString(R.string.eip_state_not_connected)))
+	    fail();
+	solo.sleep(2*1000);
+    }
+
+    private void sayOkToDisconnect() {
+	if(!solo.waitForActivity(DisconnectVPN.class))
+	    fail();
+	solo.clickOnText(getActivity().getString(android.R.string.yes));
+    }
+    
+    private void testEipIsOnNoNetwork() {
+	ConnectionManager.setMobileDataEnabled(false, solo.getCurrentActivity().getApplicationContext());
+	if(!solo.waitForText(getActivity().getString(R.string.eip_state_not_connected), 1, 15*1000))
+	    fail();
+    }
+    
     public void testLogInAndOut() {
 		long miliseconds_to_log_in = 40 * 1000;
 		solo.clickOnActionBarItem(R.id.login_button);
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f73d59cb..a90d6396 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
-    android:versionCode="84"
-    android:versionName="0.5.3" >
+    android:versionCode="86"
+    android:versionName="0.5.4" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index 0b43f9e1..7374d5ed 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -445,7 +445,7 @@ public final class EIP extends IntentService {
 		} catch (JSONException e) {
 		    Log.v(TAG,"Couldn't read gateway name for profile creation! Returning original name = " + mName);
 		    e.printStackTrace();
-		    return mName;
+		    return (mName != null) ? mName : "";
 		}
 	    }