New method to set on/off data connection.

Used in tests, but it's going to be used in the near future when
blocking data connections until EIP is on.

4 files changed, 49 insertions, 40 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9c154c04..505f6ee1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,7 +22,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />    
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
     <!-- if you want to run the unit test for Dashboard you will need that you uncomment the following line --> 
     <!--   <uses-permission android:name="android.permission.WRITE_SETTINGS" />  -->  
     
diff --git a/tests/src/se/leap/bitmaskclient/test/ConnectionManager.java b/tests/src/se/leap/bitmaskclient/test/ConnectionManager.java
new file mode 100644
index 00000000..8722bb13
--- /dev/null
+++ b/tests/src/se/leap/bitmaskclient/test/ConnectionManager.java
@@ -0,0 +1,36 @@
+package se.leap.bitmaskclient.test;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import android.util.Log;
+
+public class ConnectionManager {
+    static void setMobileDataEnabled(boolean enabled, Context context) {
+	final ConnectivityManager conman = (ConnectivityManager)  context.getSystemService(Context.CONNECTIVITY_SERVICE);
+	try {
+	    final Class conmanClass = Class.forName(conman.getClass().getName());
+	    final Field iConnectivityManagerField = conmanClass.getDeclaredField("mService");
+	    iConnectivityManagerField.setAccessible(true);
+	    final Object iConnectivityManager = iConnectivityManagerField.get(conman);
+	    final Class iConnectivityManagerClass =  Class.forName(iConnectivityManager.getClass().getName());
+	    final Method setMobileDataEnabledMethod = iConnectivityManagerClass.getDeclaredMethod("setMobileDataEnabled", Boolean.TYPE);
+	    setMobileDataEnabledMethod.setAccessible(true);
+
+	    setMobileDataEnabledMethod.invoke(iConnectivityManager, enabled);
+	    Log.d("testDashboard", "setMobileDataEnabled(" + enabled + ");");
+	} catch (ClassNotFoundException e) {
+	    e.printStackTrace();
+	} catch (NoSuchMethodException e) {
+	    e.printStackTrace();
+	} catch (IllegalAccessException e) {
+	    e.printStackTrace();
+	} catch (NoSuchFieldException e) {
+	    e.printStackTrace();
+	} catch (InvocationTargetException e) {
+	    e.printStackTrace();
+	}
+    }
+}
diff --git a/tests/src/se/leap/bitmaskclient/test/testConfigurationWizard.java b/tests/src/se/leap/bitmaskclient/test/testConfigurationWizard.java
index 55fd87ae..847d8cdd 100644
--- a/tests/src/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/tests/src/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -1,15 +1,14 @@
 package se.leap.bitmaskclient.test;
 
+import android.test.ActivityInstrumentationTestCase2;
+import android.widget.ListView;
+import com.jayway.android.robotium.solo.Solo;
 import java.io.IOException;
-
 import se.leap.bitmaskclient.AboutActivity;
 import se.leap.bitmaskclient.ConfigurationWizard;
 import se.leap.bitmaskclient.ProviderDetailFragment;
 import se.leap.bitmaskclient.R;
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.ListView;
-
-import com.jayway.android.robotium.solo.Solo;
+import se.leap.bitmaskclient.test.ConnectionManager;
 
 public class testConfigurationWizard extends ActivityInstrumentationTestCase2<ConfigurationWizard> {
 
@@ -24,6 +23,7 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
 	protected void setUp() throws Exception {
 		super.setUp();
 		solo = new Solo(getInstrumentation(), getActivity());
+		ConnectionManager.setMobileDataEnabled(true, solo.getCurrentActivity().getApplicationContext());
 	}
 
 	@Override
diff --git a/tests/src/se/leap/bitmaskclient/test/testDashboard.java b/tests/src/se/leap/bitmaskclient/test/testDashboard.java
index a6b25c0a..cdffcfab 100644
--- a/tests/src/se/leap/bitmaskclient/test/testDashboard.java
+++ b/tests/src/se/leap/bitmaskclient/test/testDashboard.java
@@ -1,21 +1,17 @@
 package se.leap.bitmaskclient.test;
 
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.net.ConnectivityManager;
 import android.provider.Settings;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 import com.jayway.android.robotium.solo.Solo;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import se.leap.bitmaskclient.ConfigurationWizard;
 import se.leap.bitmaskclient.Dashboard;
 import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.test.ConnectionManager;
 import se.leap.openvpn.MainActivity;
 
 public class testDashboard extends ActivityInstrumentationTestCase2<Dashboard> {
@@ -30,7 +26,7 @@ public class testDashboard extends ActivityInstrumentationTestCase2<Dashboard> {
 	protected void setUp() throws Exception {
 		super.setUp();
 		solo = new Solo(getInstrumentation(), getActivity());
-		setAirplaneMode(false);
+		ConnectionManager.setMobileDataEnabled(true, solo.getCurrentActivity().getApplicationContext());
 	}
 
 	@Override
@@ -53,21 +49,18 @@ public class testDashboard extends ActivityInstrumentationTestCase2<Dashboard> {
 		
 		solo.clickOnView(solo.getView(R.id.eipSwitch));
 		if(!solo.waitForText("Not running! Connection not secure"))
-			fail();
-		/* setAirplaneMode isn't working right now.
-		setAirplaneMode(true);
-		if(!solo.waitForLogMessage("Service state changed"))
-			fail();
+		    fail();
+
+		ConnectionManager.setMobileDataEnabled(false, solo.getCurrentActivity().getApplicationContext());
 		
 		solo.clickOnView(solo.getView(R.id.eipSwitch));
 		if(!solo.waitForText("Initiating connection"))
 			fail();
 		if(!solo.waitForText("Waiting for usable network"))
 			fail();
-		*/
 	}
 	
-	public void testLogInAndOut() {
+    public void testLogInAndOut() {
 		long miliseconds_to_log_in = 40 * 1000;
 		solo.clickOnActionBarItem(R.id.login_button);
 		solo.enterText(0, "parmegvtest1");
@@ -112,25 +105,4 @@ public class testDashboard extends ActivityInstrumentationTestCase2<Dashboard> {
 		solo.clickOnMenuItem("ICS OpenVPN Interface");
 		solo.waitForActivity(MainActivity.class);
 	}
-	
-    private void setAirplaneMode(boolean airplane_mode) {
-	Context context = solo.getCurrentActivity().getApplicationContext();
-	final ConnectivityManager conman = (ConnectivityManager)  context.getSystemService(Context.CONNECTIVITY_SERVICE);
-	try {
-	    final Class conmanClass = Class.forName(conman.getClass().getName());
-	    final Field iConnectivityManagerField = conmanClass.getDeclaredField("mService");
-	    iConnectivityManagerField.setAccessible(true);
-	    final Object iConnectivityManager = iConnectivityManagerField.get(conman);
-	    final Class iConnectivityManagerClass =  Class.forName(iConnectivityManager.getClass().getName());
-	    final Method setMobileDataEnabledMethod = iConnectivityManagerClass.getDeclaredMethod("setMobileDataEnabled", Boolean.TYPE);
-	    setMobileDataEnabledMethod.setAccessible(true);
-
-	    setMobileDataEnabledMethod.invoke(iConnectivityManager, !airplane_mode);
-	} catch (ClassNotFoundException e) {
-	} catch (NoSuchMethodException e) {
-	} catch (IllegalAccessException e) {
-	} catch (NoSuchFieldException e) {
-	} catch (InvocationTargetException e) {
-	}
-    }
 }