diff options
author | lalottacontinua <loddatio@posteo.de> | 2018-07-21 03:01:44 -0700 |
---|---|---|
committer | lalottacontinua <loddatio@posteo.de> | 2018-07-21 03:01:44 -0700 |
commit | 7434a53d0c2545375ff9844a510c9fc8b09948f0 (patch) | |
tree | bdf7b4a2ee6043c3c63cce265fa7c52e5eb92273 /app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java | |
parent | ce6f1c9c9b402bc2e92462353bb56cadfb9b2f35 (diff) | |
parent | 9b50dcae236f9f93d24f7991df4d7acf64219b73 (diff) |
Merge branch '#8886_add_provider' into 'master'
#8886 add provider
See merge request leap/bitmask_android!79
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java index 5bd9575e..3cfae776 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java @@ -52,7 +52,8 @@ public class ProviderSetupFailedDialog extends DialogFragment { DEFAULT, ERROR_CORRUPTED_PROVIDER_JSON, ERROR_INVALID_CERTIFICATE, - ERROR_CERTIFICATE_PINNING + ERROR_CERTIFICATE_PINNING, + ERROR_NEW_URL_NO_VPN_PROVIDER } /** @@ -68,7 +69,7 @@ public class ProviderSetupFailedDialog extends DialogFragment { /** * @return a new instance of this DialogFragment. */ - public static DialogFragment newInstance(Provider provider, JSONObject errorJson) { + public static DialogFragment newInstance(Provider provider, JSONObject errorJson, boolean testNewURL) { ProviderSetupFailedDialog dialogFragment = new ProviderSetupFailedDialog(); dialogFragment.provider = provider; try { @@ -81,6 +82,8 @@ public class ProviderSetupFailedDialog extends DialogFragment { if (errorJson.has(ERRORID)) { dialogFragment.downloadError = valueOf(errorJson.getString(ERRORID)); + } else if (testNewURL) { + dialogFragment.downloadError = DOWNLOAD_ERRORS.ERROR_NEW_URL_NO_VPN_PROVIDER; } } catch (Exception e) { e.printStackTrace(); @@ -123,6 +126,13 @@ public class ProviderSetupFailedDialog extends DialogFragment { } }); break; + case ERROR_NEW_URL_NO_VPN_PROVIDER: + builder.setPositiveButton(R.string.retry, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + interfaceWithConfigurationWizard.addAndSelectNewProvider(provider.getMainUrlString()); + } + }); + break; default: builder.setPositiveButton(R.string.retry, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -142,6 +152,8 @@ public class ProviderSetupFailedDialog extends DialogFragment { void cancelSettingUpProvider(); void updateProviderDetails(); + + void addAndSelectNewProvider(String url); } DownloadFailedDialogInterface interfaceWithConfigurationWizard; |