summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java2
-rw-r--r--app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Dashboard.java2
3 files changed, 4 insertions, 4 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 847d8cdd..8ddfbc57 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -46,7 +46,7 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
public void testAddNewProvider() {
solo.clickOnActionBarItem(R.id.new_provider);
- solo.enterText(0, "dev.bitmask.net");
+ solo.enterText(0, "calyx.net");
solo.clickOnCheckBox(0);
solo.clickOnText(solo.getString(R.string.save));
added_providers = added_providers+1;
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 269f1d18..bbc3e97d 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboard.java
@@ -50,14 +50,14 @@ public class testDashboard extends ActivityInstrumentationTestCase2<Dashboard> {
if(!solo.waitForText(getActivity().getString(R.string.eip_state_not_connected)))
fail();
- ConnectionManager.setMobileDataEnabled(false, solo.getCurrentActivity().getApplicationContext());
+ /*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();
-
+ */
}
public void testLogInAndOut() {
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index b388b84a..292434c7 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -114,7 +114,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
View view = ((ViewGroup)findViewById(android.R.id.content)).getChildAt(0);
logInDialog(view, Bundle.EMPTY);
}
- } else if(resultCode == RESULT_CANCELED && data.hasExtra(ACTION_QUIT)) {
+ } else if(resultCode == RESULT_CANCELED && (data == null || data.hasExtra(ACTION_QUIT))) {
finish();
} else
configErrorDialog();