From 9f6e74680e5cfe6507bd1e37ea217cf2887af3cc Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Fri, 9 Feb 2018 14:33:20 +0100
Subject: 8827 - resolve discussions

* remove stop for providerApi
* enable retrySetUpProvider
* renamed PROVIDER_KEY for EIP_JSON to PROVIDER_EIP_DEFINITION
---
 .../leap/bitmaskclient/ProviderListBaseActivity.java | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
index 6a76dd55..6fa3b503 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
@@ -46,7 +46,6 @@ import butterknife.InjectView;
 import butterknife.OnItemClick;
 import se.leap.bitmaskclient.fragments.AboutFragment;
 
-import static android.view.View.GONE;
 import static se.leap.bitmaskclient.Constants.APP_ACTION_QUIT;
 import static se.leap.bitmaskclient.Constants.BROADCAST_PROVIDER_API_EVENT;
 import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_CODE;
@@ -229,10 +228,6 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
     }
 
     void handleProviderSetupFailed(Bundle resultData) {
-        mConfigState.setAction(PROVIDER_NOT_SET);
-
-        setResult(RESULT_CANCELED, mConfigState);
-
         reasonToFail = resultData.getString(ERRORS);
         showDownloadFailedDialog();
     }
@@ -242,8 +237,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
     }
 
     void handleIncorrectlyDownloadedCertificate() {
-        mConfigState.setAction(PROVIDER_NOT_SET);
-        hideProgressBar();
+        cancelSettingUpProvider();
         setResult(RESULT_CANCELED, mConfigState);
     }
 
@@ -289,26 +283,18 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
     }
 
     private void stopSettingUpProvider() {
-        ProviderAPI.stop();
-        loadingScreen.setVisibility(GONE);
-
         cancelSettingUpProvider();
     }
 
     @Override
     public void cancelSettingUpProvider() {
-        hideProgressBar();
         mConfigState.setAction(PROVIDER_NOT_SET);
+        hideProgressBar();
     }
 
     @Override
     public void updateProviderDetails() {
-        mConfigState.setAction(SETTING_UP_PROVIDER);
-
-        Bundle parameters = new Bundle();
-        parameters.putString(Provider.MAIN_URL, provider.getMainUrl().toString());
-
-        ProviderAPICommand.execute(this, UPDATE_PROVIDER_DETAILS, parameters, provider);
+        ProviderAPICommand.execute(this, UPDATE_PROVIDER_DETAILS, provider);
     }
 
     public void checkProviderSetUp() {
-- 
cgit v1.2.3