diff options
| author | lalottacontinua <loddatio@posteo.de> | 2018-05-22 22:53:07 +0200 |
|---|---|---|
| committer | lalottacontinua <loddatio@posteo.de> | 2018-05-22 22:53:07 +0200 |
| commit | 9c2599bda6e1e9809f57610c6450b166016f5a4d (patch) | |
| tree | 4ac2fd4c99b4a9f7d93fd57379b7d53de420bc2e /app/src/main | |
| parent | 20cde35143f5e9f2808e361ebb674c3bb26feafe (diff) | |
false url displayed when retry clicked
Diffstat (limited to 'app/src/main')
3 files changed, 8 insertions, 2 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6f6feebb..25300c8d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -93,6 +93,10 @@ android:label="@string/configuration_wizard_title" /> <activity + android:name=".AddProviderActivity" + android:label="@string/add_provider" /> + + <activity android:name=".ProviderDetailActivity" android:label="@string/provider_details_title" android:launchMode="singleTop" /> diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java index 756264ec..c2345ec1 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java @@ -196,7 +196,9 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity } else if (requestCode == REQUEST_CODE_ADD_PROVIDER) { if (resultCode == RESULT_OK) { testNewURL = true; - showAndSelectProvider(data.getStringExtra("new_url")); + String newUrl = data.getStringExtra("new_url"); + this.provider.setMainUrl(newUrl); + showAndSelectProvider(newUrl); } } } diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java index 3d0bdbdb..3cfae776 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java @@ -129,7 +129,7 @@ public class ProviderSetupFailedDialog extends DialogFragment { 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.getApiUrlString()); + interfaceWithConfigurationWizard.addAndSelectNewProvider(provider.getMainUrlString()); } }); break; |