Merge branch '8827_handle_switch_provider' into '0.9.8'

8827 handle switch provider

See merge request leap/bitmask_android!38

1 files changed, 4 insertions, 23 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java
index ccc71a67..b3399416 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -20,6 +20,7 @@ import android.annotation.SuppressLint;
 import android.app.IntentService;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.support.v4.content.LocalBroadcastManager;
 
 import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
 
@@ -40,22 +41,17 @@ public class ProviderAPI extends IntentService implements ProviderApiManagerBase
             TAG = ProviderAPI.class.getSimpleName(),
             SET_UP_PROVIDER = "setUpProvider",
             UPDATE_PROVIDER_DETAILS = "updateProviderDetails",
-            DOWNLOAD_NEW_PROVIDER_DOTJSON = "downloadNewProviderDotJSON",
             SIGN_UP = "srpRegister",
             LOG_IN = "srpAuth",
             LOG_OUT = "logOut",
             DOWNLOAD_CERTIFICATE = "downloadUserAuthedCertificate",
             PARAMETERS = "parameters",
-            RESULT_KEY = "result",
-            RESULT_CODE = "RESULT CODE",
             RECEIVER_KEY = "receiver",
             ERRORS = "errors",
             ERRORID = "errorId",
             UPDATE_PROGRESSBAR = "update_progressbar",
-            CURRENT_PROGRESS = "current_progress",
-            DOWNLOAD_EIP_SERVICE = TAG + ".DOWNLOAD_EIP_SERVICE",
-            PROVIDER_SET_UP = TAG + ".PROVIDER_SET_UP",
-            PROVIDER_API_EVENT = "PROVIDER_API_EVENT";
+            DOWNLOAD_EIP_SERVICE = "ProviderAPI.DOWNLOAD_EIP_SERVICE",
+            PROVIDER_SET_UP = "ProviderAPI.PROVIDER_SET_UP";
 
     final public static int
             SUCCESSFUL_LOGIN = 3,
@@ -80,21 +76,6 @@ public class ProviderAPI extends IntentService implements ProviderApiManagerBase
     }
 
     //TODO: refactor me, please!
-    public static void stop() {
-        ProviderApiManager.stop();
-    }
-
-    //TODO: refactor me, please!
-    public static boolean caCertDownloaded() {
-        return ProviderApiManager.caCertDownloaded();
-    }
-
-    //TODO: refactor me, please!
-    public static String lastProviderMainUrl() {
-        return ProviderApiManager.lastProviderMainUrl();
-    }
-
-    //TODO: refactor me, please!
     //used in insecure flavor only
     @SuppressLint("unused")
     public static boolean lastDangerOn() {
@@ -110,7 +91,7 @@ public class ProviderAPI extends IntentService implements ProviderApiManagerBase
 
     @Override
     public void broadcastEvent(Intent intent) {
-        sendBroadcast(intent);
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
     }
 
     @Override