Merge branch 'bug/Bitmask-gets-killed-problems-when-trying-to-restart-it-#6586' into develop

2 files changed, 14 insertions, 1 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 229c3452..78ce1c81 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -49,7 +49,7 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
 		solo.enterText(0, "calyx.net");
 		solo.clickOnCheckBox(0);
 		solo.clickOnText(solo.getString(R.string.save));
-		added_providers = added_providers+1;
+		//added_providers = added_providers+1;
 		assertTrue("Provider details dialog did not appear", solo.waitForFragmentByTag(ProviderDetailFragment.TAG, 60*1000));
 		solo.goBack();
 	}
diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
index 94cb67a3..0c7db284 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
@@ -9,6 +9,10 @@ import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 import com.robotium.solo.Solo;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Scanner;
+
 import de.blinkt.openvpn.activities.DisconnectVPN;
 import se.leap.bitmaskclient.ConfigurationWizard;
 import se.leap.bitmaskclient.Dashboard;
@@ -150,4 +154,13 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
                 "-----END CERTIFICATE-----";
 
     }
+
+    public void testReboot() {
+        try {
+            String command = "adb shell am broadcast -a android.intent.action.BOOT_COMPLETED";
+            Runtime.getRuntime().exec(command);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }