From 9c2599bda6e1e9809f57610c6450b166016f5a4d Mon Sep 17 00:00:00 2001
From: lalottacontinua <loddatio@posteo.de>
Date: Tue, 22 May 2018 22:53:07 +0200
Subject: false url displayed when retry clicked

---
 app/src/main/AndroidManifest.xml                                      | 4 ++++
 app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | 4 +++-
 .../main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java    | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/src/main')

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
@@ -92,6 +92,10 @@
             android:name=".ProviderListActivity"
             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"
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;
-- 
cgit v1.2.3