summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-03-13 15:28:59 +0100
committerParménides GV <parmegv@sdf.org>2015-03-13 15:28:59 +0100
commit429295bd6ee5f2caa57c287e74392c80aed25f20 (patch)
tree951421cca40bb22d3c15025b2b167f08e3db6d76 /app/src
parentca237c5c17740f1a01b480a83843175ee4d1d947 (diff)
If a provider fails to be configured, go back to CW.
Diffstat (limited to 'app/src')
-rw-r--r--app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java3
-rw-r--r--app/src/main/res/values/strings.xml2
2 files changed, 4 insertions, 1 deletions
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
index d28bb690..ed2a063c 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -215,7 +215,8 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
setResult(RESULT_OK);
} else if(resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE) {
hideProgressBar();
-
+ cancelSettingUpProvider();
+ Toast.makeText(getApplicationContext(), R.string.provider_problem, Toast.LENGTH_LONG).show();
setResult(RESULT_CANCELED, mConfigState);
} else if(resultCode == AboutActivity.VIEWED) {
// Do nothing, right now
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 032602cb..897223ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -71,4 +71,6 @@
<string name="no">No</string>
<string name="eip_state_not_connected">"Not running! Connection not secure!"</string>
<string name="eip_state_connected">Connection Secure.</string>
+ <string name="provider_problem">It seems there is a problem with the provider.</string>
+ <string name="try_another_provider">Please try another provider, or contact yours.</string>
</resources>