8827 - resolve discussions

* remove stop for providerApi
* enable retrySetUpProvider
* renamed PROVIDER_KEY for EIP_JSON to PROVIDER_EIP_DEFINITION

1 files changed, 4 insertions, 11 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
index 6b6aa89d..f1c0ecef 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
@@ -115,15 +115,10 @@ public abstract class ProviderApiManagerBase {
 
     private ProviderApiServiceCallback serviceCallback;
 
-    static boolean go_ahead = true;
     protected SharedPreferences preferences;
     protected Resources resources;
     OkHttpClientGenerator clientGenerator;
 
-    public static void stop() {
-        go_ahead = false;
-    }
-
     ProviderApiManagerBase(SharedPreferences preferences, Resources resources, OkHttpClientGenerator clientGenerator, ProviderApiServiceCallback callback) {
         this.preferences = preferences;
         this.resources = resources;
@@ -158,12 +153,10 @@ public abstract class ProviderApiManagerBase {
             }
         } else if (action.equalsIgnoreCase(SET_UP_PROVIDER)) {
             Bundle result = setUpProvider(provider, parameters);
-            if (go_ahead) {
-                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
-                    sendToReceiverOrBroadcast(receiver, PROVIDER_OK, result, provider);
-                } else {
-                    sendToReceiverOrBroadcast(receiver, PROVIDER_NOK, result, provider);
-                }
+            if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                sendToReceiverOrBroadcast(receiver, PROVIDER_OK, result, provider);
+            } else {
+                sendToReceiverOrBroadcast(receiver, PROVIDER_NOK, result, provider);
             }
         } else if (action.equalsIgnoreCase(SIGN_UP)) {
             Bundle result = tryToRegister(parameters);