initial refactoring to add a separate provider api manager for API v5

12 files changed, 1649 insertions, 1780 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/IProviderApiManager.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/IProviderApiManager.java
new file mode 100644
index 00000000..604dc060
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/IProviderApiManager.java
@@ -0,0 +1,11 @@
+package se.leap.bitmaskclient.providersetup;
+
+import android.os.Bundle;
+import android.os.ResultReceiver;
+
+import se.leap.bitmaskclient.base.models.Provider;
+
+public interface IProviderApiManager {
+    void handleAction(String action, Provider provider, Bundle parameters, ResultReceiver receiver);
+
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java
index 68699da2..751bf1dc 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java
@@ -16,7 +16,6 @@
  */
 package se.leap.bitmaskclient.providersetup;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
@@ -31,11 +30,10 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import java.util.concurrent.TimeoutException;
 
 import se.leap.bitmaskclient.base.models.Provider;
-import se.leap.bitmaskclient.providersetup.connectivity.OkHttpClientGenerator;
 import se.leap.bitmaskclient.tor.TorServiceCommand;
 
 /**
- * Implements HTTP api methods (encapsulated in {{@link ProviderApiManager}})
+ * Implements HTTP api methods (encapsulated in {{@link ProviderApiManagerV3}})
  * used to manage communications with the provider server.
  * <p/>
  * It's an JobIntentService because it downloads data from the Internet, so it operates in the background.
@@ -83,12 +81,6 @@ public class ProviderAPI extends JobIntentService implements ProviderApiManagerB
             DOWNLOAD_SERVICE_JSON = "ProviderAPI.DOWNLOAD_SERVICE_JSON";
 
     final public static int
-            SUCCESSFUL_LOGIN = 3,
-            FAILED_LOGIN = 4,
-            SUCCESSFUL_SIGNUP = 5,
-            FAILED_SIGNUP = 6,
-            SUCCESSFUL_LOGOUT = 7,
-            LOGOUT_FAILED = 8,
             CORRECTLY_DOWNLOADED_VPN_CERTIFICATE = 9,
             INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE = 10,
             PROVIDER_OK = 11,
@@ -105,17 +97,10 @@ public class ProviderAPI extends JobIntentService implements ProviderApiManagerB
 
     ProviderApiManager providerApiManager;
 
-    //TODO: refactor me, please!
-    //used in insecure flavor only
-    @SuppressLint("unused")
-    public static boolean lastDangerOn() {
-        return ProviderApiManager.lastDangerOn();
-    }
-
     @Override
     public void onCreate() {
         super.onCreate();
-        providerApiManager = initApiManager();
+        providerApiManager = new ProviderApiManager(getResources(), this);
     }
 
     /**
@@ -184,10 +169,4 @@ public class ProviderAPI extends JobIntentService implements ProviderApiManagerB
         pm.saveCustomProviders();
     }
 
-
-    private ProviderApiManager initApiManager() {
-        OkHttpClientGenerator clientGenerator = new OkHttpClientGenerator(getResources());
-        return new ProviderApiManager(getResources(), clientGenerator, this);
-    }
-
 }
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiEventSender.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiEventSender.java
new file mode 100644
index 00000000..1c8bd39b
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiEventSender.java
@@ -0,0 +1,180 @@
+package se.leap.bitmaskclient.providersetup;
+
+import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_PROVIDER_API_EVENT;
+import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_CODE;
+import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_KEY;
+import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_KEY;
+import static se.leap.bitmaskclient.base.utils.ConfigHelper.getProviderFormattedString;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.ERRORID;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.ERRORS;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_EIP_SERVICE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_GEOIP_JSON;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.INITIAL_ACTION;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.PROVIDER_NOK;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.TOR_EXCEPTION;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.TOR_TIMEOUT;
+
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.ResultReceiver;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import de.blinkt.openvpn.core.VpnStatus;
+import se.leap.bitmaskclient.base.models.Provider;
+
+public class ProviderApiEventSender {
+
+    private final Resources resources;
+    private final ProviderApiManagerBase.ProviderApiServiceCallback serviceCallback;
+
+    public ProviderApiEventSender(Resources resources, ProviderApiManagerBase.ProviderApiServiceCallback callback) {
+        this.resources = resources;
+        this.serviceCallback = callback;
+    }
+
+    /**
+     * Interprets the error message as a JSON object and extract the "errors" keyword pair.
+     * If the error message is not a JSON object, then it is returned untouched.
+     *
+     * @param stringJsonErrorMessage
+     * @return final error message
+     */
+    protected String pickErrorMessage(String stringJsonErrorMessage) {
+        String errorMessage = "";
+        try {
+            JSONObject jsonErrorMessage = new JSONObject(stringJsonErrorMessage);
+            errorMessage = jsonErrorMessage.getString(ERRORS);
+        } catch (JSONException e) {
+            // TODO Auto-generated catch block
+            errorMessage = stringJsonErrorMessage;
+        } catch (NullPointerException e) {
+            //do nothing
+        }
+
+        return errorMessage;
+    }
+
+    protected Bundle setErrorResult(Bundle result, String stringJsonErrorMessage) {
+        String reasonToFail = pickErrorMessage(stringJsonErrorMessage);
+        VpnStatus.logWarning("[API] error: " + reasonToFail);
+        result.putString(ERRORS, reasonToFail);
+        result.putBoolean(BROADCAST_RESULT_KEY, false);
+        return result;
+    }
+
+    Bundle setErrorResultAction(Bundle result, String initialAction) {
+        JSONObject errorJson = new JSONObject();
+        addErrorMessageToJson(errorJson, null, null, initialAction);
+        VpnStatus.logWarning("[API] error: " + initialAction + " failed.");
+        result.putString(ERRORS, errorJson.toString());
+        result.putBoolean(BROADCAST_RESULT_KEY, false);
+        return result;
+    }
+
+    Bundle setErrorResult(Bundle result, int errorMessageId, String errorId) {
+        return setErrorResult(result, errorMessageId, errorId, null);
+    }
+
+    Bundle setErrorResult(Bundle result, int errorMessageId, String errorId, String initialAction) {
+        JSONObject errorJson = new JSONObject();
+        String errorMessage = getProviderFormattedString(resources, errorMessageId);
+        addErrorMessageToJson(errorJson, errorMessage, errorId, initialAction);
+        VpnStatus.logWarning("[API] error: " + errorMessage);
+        result.putString(ERRORS, errorJson.toString());
+        result.putBoolean(BROADCAST_RESULT_KEY, false);
+        return result;
+    }
+
+
+    private void addErrorMessageToJson(JSONObject jsonObject, String errorMessage) {
+        try {
+            jsonObject.put(ERRORS, errorMessage);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void addErrorMessageToJson(JSONObject jsonObject, String errorMessage, String errorId, String initialAction) {
+        try {
+            jsonObject.putOpt(ERRORS, errorMessage);
+            jsonObject.putOpt(ERRORID, errorId);
+            jsonObject.putOpt(INITIAL_ACTION, initialAction);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    protected void sendToReceiverOrBroadcast(ResultReceiver receiver, int resultCode, Bundle resultData, Provider provider) {
+        if (resultData == null || resultData == Bundle.EMPTY) {
+            resultData = new Bundle();
+        }
+        resultData.putParcelable(PROVIDER_KEY, provider);
+        if (receiver != null) {
+            receiver.send(resultCode, resultData);
+        } else {
+            broadcastEvent(resultCode, resultData);
+        }
+        handleEventSummaryErrorLog(resultCode);
+    }
+
+    private void broadcastEvent(int resultCode , Bundle resultData) {
+        Intent intentUpdate = new Intent(BROADCAST_PROVIDER_API_EVENT);
+        intentUpdate.addCategory(Intent.CATEGORY_DEFAULT);
+        intentUpdate.putExtra(BROADCAST_RESULT_CODE, resultCode);
+        intentUpdate.putExtra(BROADCAST_RESULT_KEY, resultData);
+        serviceCallback.broadcastEvent(intentUpdate);
+    }
+
+    private void handleEventSummaryErrorLog(int resultCode) {
+        String event = null;
+        switch (resultCode) {
+            case INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE:
+                event = "download of vpn certificate.";
+                break;
+            case PROVIDER_NOK:
+                event = "setup or update provider details.";
+                break;
+            case INCORRECTLY_DOWNLOADED_EIP_SERVICE:
+                event = "update eip-service.json";
+                break;
+            case INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE:
+                event = "update invalid vpn certificate.";
+                break;
+            case INCORRECTLY_DOWNLOADED_GEOIP_JSON:
+                event = "download menshen service json.";
+                break;
+            case TOR_TIMEOUT:
+            case TOR_EXCEPTION:
+                event = "start tor for censorship circumvention";
+                break;
+            default:
+                break;
+        }
+        if (event != null) {
+            VpnStatus.logWarning("[API] failed provider API event: " + event);
+        }
+    }
+
+    String formatErrorMessage(final int errorStringId) {
+        return formatErrorMessage(getProviderFormattedString(resources, errorStringId));
+    }
+
+    private String formatErrorMessage(String errorMessage) {
+        return "{ \"" + ERRORS + "\" : \"" + errorMessage + "\" }";
+    }
+
+    private JSONObject getErrorMessageAsJson(final int toastStringId) {
+        try {
+            return new JSONObject(formatErrorMessage(toastStringId));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            return new JSONObject();
+        }
+    }
+
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java
new file mode 100644
index 00000000..0d023dfc
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java
@@ -0,0 +1,233 @@
+package se.leap.bitmaskclient.providersetup;
+
+import static se.leap.bitmaskclient.BuildConfig.DEBUG_MODE;
+import static se.leap.bitmaskclient.R.string.certificate_error;
+import static se.leap.bitmaskclient.R.string.error_io_exception_user_message;
+import static se.leap.bitmaskclient.R.string.error_json_exception_user_message;
+import static se.leap.bitmaskclient.R.string.error_no_such_algorithm_exception_user_message;
+import static se.leap.bitmaskclient.R.string.malformed_url;
+import static se.leap.bitmaskclient.R.string.server_unreachable_message;
+import static se.leap.bitmaskclient.R.string.service_is_down_error;
+import static se.leap.bitmaskclient.R.string.warning_corrupted_provider_details;
+import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_KEY;
+import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_KEY;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.DELAY;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.ERRORS;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.MISSING_NETWORK_CONNECTION;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.PARAMETERS;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.RECEIVER_KEY;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.TOR_EXCEPTION;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.TOR_TIMEOUT;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_CORRUPTED_PROVIDER_JSON;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_TOR_TIMEOUT;
+import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.OFF;
+import static se.leap.bitmaskclient.tor.TorStatusObservable.getProxyPort;
+
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.ResultReceiver;
+import android.util.Log;
+import android.util.Pair;
+
+import org.jetbrains.annotations.Blocking;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+import java.net.UnknownServiceException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLPeerUnverifiedException;
+
+import de.blinkt.openvpn.core.VpnStatus;
+import okhttp3.OkHttpClient;
+import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.base.models.Provider;
+import se.leap.bitmaskclient.base.utils.ConfigHelper;
+import se.leap.bitmaskclient.base.utils.PreferenceHelper;
+import se.leap.bitmaskclient.providersetup.connectivity.OkHttpClientGenerator;
+import se.leap.bitmaskclient.tor.TorStatusObservable;
+
+public class ProviderApiManager extends ProviderApiManagerBase {
+    public static final String TAG = ProviderApiManager.class.getSimpleName();
+    public final ProviderApiManagerFactory versionedApiFactory;
+
+    public ProviderApiManager(Resources resources, ProviderApiManagerBase.ProviderApiServiceCallback callback) {
+        super(resources, callback);
+        this.versionedApiFactory = new ProviderApiManagerFactory(resources, callback);
+    }
+
+    @Blocking
+    public void handleIntent(Intent command) {
+        ResultReceiver receiver = null;
+        if (command.getParcelableExtra(RECEIVER_KEY) != null) {
+            receiver = command.getParcelableExtra(RECEIVER_KEY);
+        }
+        String action = command.getAction();
+        Bundle parameters = command.getBundleExtra(PARAMETERS);
+
+        if (action == null) {
+            Log.e(TAG, "Intent without action sent!");
+            return;
+        }
+
+        Provider provider = null;
+        if (command.getParcelableExtra(PROVIDER_KEY) != null) {
+            provider = command.getParcelableExtra(PROVIDER_KEY);
+        } else {
+            //TODO: consider returning error back e.g. NO_PROVIDER
+            Log.e(TAG, action +" called without provider!");
+            return;
+        }
+
+        if (parameters.containsKey(DELAY)) {
+            try {
+                Thread.sleep(parameters.getLong(DELAY));
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (!serviceCallback.hasNetworkConnection()) {
+            Bundle result = new Bundle();
+            eventSender.setErrorResult(result, R.string.error_network_connection, null);
+            eventSender.sendToReceiverOrBroadcast(receiver, MISSING_NETWORK_CONNECTION, result, provider);
+            return;
+        }
+        Bundle result = new Bundle();
+
+        try {
+            if (PreferenceHelper.hasSnowflakePrefs() && !VpnStatus.isVPNActive()) {
+                torHandler.startTorProxy();
+            }
+        } catch (InterruptedException | IllegalStateException e) {
+            e.printStackTrace();
+            eventSender.setErrorResultAction(result, action);
+            eventSender.sendToReceiverOrBroadcast(receiver, TOR_EXCEPTION, result, provider);
+            return;
+        } catch (TimeoutException e) {
+            torHandler.stopTorProxy();
+            eventSender.setErrorResult(result, R.string.error_tor_timeout, ERROR_TOR_TIMEOUT.toString(), action);
+            eventSender.sendToReceiverOrBroadcast(receiver, TOR_TIMEOUT, result, provider);
+            return;
+        }
+
+
+        if (!provider.hasDefinition()) {
+            downloadProviderDefinition(provider);
+        }
+
+        IProviderApiManager apiManager = versionedApiFactory.getProviderApiManager(provider);
+        apiManager.handleAction(action, provider, parameters, receiver);
+    }
+
+    private void downloadProviderDefinition(Provider provider) {
+        getPersistedProviderUpdates(provider);
+        if (provider.hasDefinition()) {
+            return;
+        }
+        getAndSetProviderJson(provider);
+    }
+
+    private Bundle getAndSetProviderJson(Provider provider) {
+        Bundle result = new Bundle();
+
+        String providerJsonUrl = provider.getMainUrlString() + "/provider.json";
+        String providerDotJsonString = fetch(providerJsonUrl, true);
+
+        if (ConfigHelper.checkErroneousDownload(providerDotJsonString) || !isValidJson(providerDotJsonString)) {
+            eventSender.setErrorResult(result, malformed_url, null);
+            return result;
+        }
+
+        if (DEBUG_MODE) {
+            VpnStatus.logDebug("[API] PROVIDER JSON: " + providerDotJsonString);
+        }
+        try {
+            JSONObject providerJson = new JSONObject(providerDotJsonString);
+
+            if (provider.define(providerJson)) {
+                result.putBoolean(BROADCAST_RESULT_KEY, true);
+            } else {
+                return eventSender.setErrorResult(result, warning_corrupted_provider_details, ERROR_CORRUPTED_PROVIDER_JSON.toString());
+            }
+
+        } catch (JSONException e) {
+            eventSender.setErrorResult(result, providerDotJsonString);
+        }
+        return result;
+    }
+
+
+
+    /**
+     * Tries to download the contents of the provided url using commercially validated CA certificate from chosen provider.
+     *
+     */
+    private String fetch(String url, boolean allowRetry) {
+
+        JSONObject errorJson = new JSONObject();
+        OkHttpClientGenerator clientGenerator = new OkHttpClientGenerator(resources);
+
+        OkHttpClient okHttpClient = clientGenerator.initCommercialCAHttpClient(errorJson, getProxyPort());
+        List<Pair<String, String>> headerArgs = new ArrayList<>();
+        if (okHttpClient == null) {
+            return errorJson.toString();
+        }
+
+        String plainResponseBody;
+
+        try {
+
+            plainResponseBody = ProviderApiConnector.requestStringFromServer(url, "GET", null, headerArgs, okHttpClient);
+
+        } catch (NullPointerException npe) {
+            plainResponseBody = eventSender.formatErrorMessage(error_json_exception_user_message);
+            VpnStatus.logWarning("[API] Null response body for request " + url + ": " + npe.getLocalizedMessage());
+        } catch (UnknownHostException | SocketTimeoutException e) {
+            plainResponseBody = eventSender.formatErrorMessage(server_unreachable_message);
+            VpnStatus.logWarning("[API] UnknownHostException or SocketTimeoutException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (MalformedURLException e) {
+            plainResponseBody = eventSender.formatErrorMessage(malformed_url);
+            VpnStatus.logWarning("[API] MalformedURLException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (SSLHandshakeException | SSLPeerUnverifiedException e) {
+            plainResponseBody = eventSender.formatErrorMessage(certificate_error);
+            VpnStatus.logWarning("[API] SSLHandshakeException or SSLPeerUnverifiedException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (ConnectException e) {
+            plainResponseBody = eventSender.formatErrorMessage(service_is_down_error);
+            VpnStatus.logWarning("[API] ConnectException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (IllegalArgumentException e) {
+            plainResponseBody = eventSender.formatErrorMessage(error_no_such_algorithm_exception_user_message);
+            VpnStatus.logWarning("[API] IllegalArgumentException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (UnknownServiceException e) {
+            //unable to find acceptable protocols - tlsv1.2 not enabled?
+            plainResponseBody = eventSender.formatErrorMessage(error_no_such_algorithm_exception_user_message);
+            VpnStatus.logWarning("[API] UnknownServiceException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (IOException e) {
+            plainResponseBody = eventSender.formatErrorMessage(error_io_exception_user_message);
+            VpnStatus.logWarning("[API] IOException for request " + url + ": " + e.getLocalizedMessage());
+        }
+
+        try {
+            if (allowRetry &&
+                    plainResponseBody != null &&
+                    plainResponseBody.contains(ERRORS)  &&
+                    TorStatusObservable.getStatus() == OFF &&
+                    torHandler.startTorProxy()
+            ) {
+                return fetch(url, false);
+            }
+        } catch (InterruptedException | IllegalStateException | TimeoutException e) {
+            e.printStackTrace();
+        }
+        return plainResponseBody;
+    }
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
index ae55f81c..e511e276 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
@@ -17,24 +17,8 @@
 
 package se.leap.bitmaskclient.providersetup;
 
-import static se.leap.bitmaskclient.R.string.certificate_error;
-import static se.leap.bitmaskclient.R.string.error_io_exception_user_message;
-import static se.leap.bitmaskclient.R.string.error_json_exception_user_message;
-import static se.leap.bitmaskclient.R.string.error_no_such_algorithm_exception_user_message;
-import static se.leap.bitmaskclient.R.string.malformed_url;
-import static se.leap.bitmaskclient.R.string.server_unreachable_message;
-import static se.leap.bitmaskclient.R.string.service_is_down_error;
 import static se.leap.bitmaskclient.R.string.vpn_certificate_is_invalid;
-import static se.leap.bitmaskclient.R.string.warning_corrupted_provider_cert;
-import static se.leap.bitmaskclient.R.string.warning_corrupted_provider_details;
-import static se.leap.bitmaskclient.R.string.warning_expired_provider_cert;
-import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_PROVIDER_API_EVENT;
-import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_CODE;
 import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_KEY;
-import static se.leap.bitmaskclient.base.models.Constants.CREDENTIALS_PASSWORD;
-import static se.leap.bitmaskclient.base.models.Constants.CREDENTIALS_USERNAME;
-import static se.leap.bitmaskclient.base.models.Constants.EIP_ACTION_START;
-import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_KEY;
 import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_MOTD;
 import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_MOTD_HASHES;
 import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_MOTD_LAST_SEEN;
@@ -45,115 +29,34 @@ import static se.leap.bitmaskclient.base.models.Provider.CA_CERT;
 import static se.leap.bitmaskclient.base.models.Provider.GEOIP_URL;
 import static se.leap.bitmaskclient.base.models.Provider.PROVIDER_API_IP;
 import static se.leap.bitmaskclient.base.models.Provider.PROVIDER_IP;
-import static se.leap.bitmaskclient.base.utils.ConfigHelper.getTorTimeout;
-import static se.leap.bitmaskclient.base.utils.RSAHelper.parseRsaKeyFromString;
-import static se.leap.bitmaskclient.base.utils.ConfigHelper.getDomainFromMainURL;
 import static se.leap.bitmaskclient.base.utils.CertificateHelper.getFingerprintFromCertificate;
-import static se.leap.bitmaskclient.base.utils.ConfigHelper.getProviderFormattedString;
+import static se.leap.bitmaskclient.base.utils.ConfigHelper.getDomainFromMainURL;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.deleteProviderDetailsFromPreferences;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getFromPersistedProvider;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getLongFromPersistedProvider;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getStringSetFromPersistedProvider;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.BACKEND_ERROR_KEY;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.BACKEND_ERROR_MESSAGE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_DOWNLOADED_EIP_SERVICE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_DOWNLOADED_GEOIP_JSON;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_DOWNLOADED_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.DELAY;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_GEOIP_JSON;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_MOTD;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_SERVICE_JSON;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.ERRORID;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.ERRORS;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.FAILED_LOGIN;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.FAILED_SIGNUP;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_EIP_SERVICE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_GEOIP_JSON;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.INITIAL_ACTION;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.LOGOUT_FAILED;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.LOG_IN;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.LOG_OUT;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.MISSING_NETWORK_CONNECTION;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.PARAMETERS;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.PROVIDER_NOK;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.PROVIDER_OK;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.QUIETLY_UPDATE_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.RECEIVER_KEY;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.SET_UP_PROVIDER;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.SIGN_UP;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.SUCCESSFUL_LOGIN;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.SUCCESSFUL_LOGOUT;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.SUCCESSFUL_SIGNUP;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.TOR_EXCEPTION;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.TOR_TIMEOUT;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.UPDATE_PROVIDER_DETAILS;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.USER_MESSAGE;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_CERTIFICATE_PINNING;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_CORRUPTED_PROVIDER_JSON;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_INVALID_CERTIFICATE;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_TOR_TIMEOUT;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_GEOIP_JSON;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.OFF;
-import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.ON;
-import static se.leap.bitmaskclient.tor.TorStatusObservable.getProxyPort;
+import static se.leap.bitmaskclient.base.utils.RSAHelper.parseRsaKeyFromString;
 
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.os.ResultReceiver;
 import android.util.Base64;
-import android.util.Log;
-import android.util.Pair;
-
-import androidx.annotation.NonNull;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.ConnectException;
-import java.net.MalformedURLException;
-import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
-import java.net.UnknownServiceException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPrivateKey;
 import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
 
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLPeerUnverifiedException;
-
-import de.blinkt.openvpn.core.VpnStatus;
-import okhttp3.OkHttpClient;
-import se.leap.bitmaskclient.R;
-import se.leap.bitmaskclient.base.models.Constants.CREDENTIAL_ERRORS;
 import se.leap.bitmaskclient.base.models.Provider;
-import se.leap.bitmaskclient.base.models.ProviderObservable;
 import se.leap.bitmaskclient.base.utils.ConfigHelper;
 import se.leap.bitmaskclient.base.utils.PreferenceHelper;
-import se.leap.bitmaskclient.eip.EipStatus;
-import se.leap.bitmaskclient.motd.MotdClient;
-import se.leap.bitmaskclient.providersetup.connectivity.OkHttpClientGenerator;
-import se.leap.bitmaskclient.providersetup.models.LeapSRPSession;
-import se.leap.bitmaskclient.providersetup.models.SrpCredentials;
-import se.leap.bitmaskclient.providersetup.models.SrpRegistrationData;
-import se.leap.bitmaskclient.tor.TorStatusObservable;
 
 /**
  * Implements the logic of the http api calls. The methods of this class needs to be called from
@@ -173,225 +76,18 @@ public abstract class ProviderApiManagerBase {
         void saveProvider(Provider p);
     }
 
-    private final ProviderApiServiceCallback serviceCallback;
+    protected final ProviderApiServiceCallback serviceCallback;
 
     protected Resources resources;
-    OkHttpClientGenerator clientGenerator;
 
-    ProviderApiManagerBase(Resources resources, OkHttpClientGenerator clientGenerator, ProviderApiServiceCallback callback) {
+    protected ProviderApiEventSender eventSender;
+    protected ProviderApiTorHandler torHandler;
+
+    ProviderApiManagerBase(Resources resources, ProviderApiServiceCallback callback) {
         this.resources = resources;
         this.serviceCallback = callback;
-        this.clientGenerator = clientGenerator;
-    }
-
-    public void handleIntent(Intent command) {
-        ResultReceiver receiver = null;
-        if (command.getParcelableExtra(RECEIVER_KEY) != null) {
-            receiver = command.getParcelableExtra(RECEIVER_KEY);
-        }
-        String action = command.getAction();
-        Bundle parameters = command.getBundleExtra(PARAMETERS);
-
-        if (action == null) {
-            Log.e(TAG, "Intent without action sent!");
-            return;
-        }
-
-        Provider provider = null;
-        if (command.getParcelableExtra(PROVIDER_KEY) != null) {
-            provider = command.getParcelableExtra(PROVIDER_KEY);
-        } else {
-            //TODO: consider returning error back e.g. NO_PROVIDER
-            Log.e(TAG, action +" called without provider!");
-            return;
-        }
-
-        if (parameters.containsKey(DELAY)) {
-            try {
-                Thread.sleep(parameters.getLong(DELAY));
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
-        if (!serviceCallback.hasNetworkConnection()) {
-            Bundle result = new Bundle();
-            setErrorResult(result, R.string.error_network_connection, null);
-            sendToReceiverOrBroadcast(receiver, MISSING_NETWORK_CONNECTION, result, provider);
-            return;
-        }
-
-         try {
-             if (PreferenceHelper.hasSnowflakePrefs() && !VpnStatus.isVPNActive()) {
-                 startTorProxy();
-             }
-        } catch (InterruptedException | IllegalStateException e) {
-            e.printStackTrace();
-             Bundle result = new Bundle();
-             setErrorResultAction(result, action);
-             sendToReceiverOrBroadcast(receiver, TOR_EXCEPTION, result, provider);
-            return;
-        } catch (TimeoutException e) {
-             serviceCallback.stopTorService();
-             Bundle result = new Bundle();
-             setErrorResult(result, R.string.error_tor_timeout, ERROR_TOR_TIMEOUT.toString(), action);
-             sendToReceiverOrBroadcast(receiver, TOR_TIMEOUT, result, provider);
-             return;
-         }
-
-        Bundle result = new Bundle();
-        switch (action) {
-            case UPDATE_PROVIDER_DETAILS:
-                ProviderObservable.getInstance().setProviderForDns(provider);
-                resetProviderDetails(provider);
-                Bundle task = new Bundle();
-                result = setUpProvider(provider, task);
-                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
-                    getGeoIPJson(provider);
-                    sendToReceiverOrBroadcast(receiver, PROVIDER_OK, result, provider);
-                } else {
-                    sendToReceiverOrBroadcast(receiver, PROVIDER_NOK, result, provider);
-                }
-                ProviderObservable.getInstance().setProviderForDns(null);
-                break;
-
-            case SET_UP_PROVIDER:
-                ProviderObservable.getInstance().setProviderForDns(provider);
-                result = setUpProvider(provider, parameters);
-                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
-                    getGeoIPJson(provider);
-                    if (provider.hasGeoIpJson()) {
-                        ProviderSetupObservable.updateProgress(DOWNLOADED_GEOIP_JSON);
-                    }
-                    sendToReceiverOrBroadcast(receiver, PROVIDER_OK, result, provider);
-                } else {
-                    sendToReceiverOrBroadcast(receiver, PROVIDER_NOK, result, provider);
-                }
-                ProviderObservable.getInstance().setProviderForDns(null);
-                break;
-            case SIGN_UP:
-                result = tryToRegister(provider, parameters);
-                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
-                    sendToReceiverOrBroadcast(receiver, SUCCESSFUL_SIGNUP, result, provider);
-                } else {
-                    sendToReceiverOrBroadcast(receiver, FAILED_SIGNUP, result, provider);
-                }
-                break;
-            case LOG_IN:
-                result = tryToAuthenticate(provider, parameters);
-                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
-                    sendToReceiverOrBroadcast(receiver, SUCCESSFUL_LOGIN, result, provider);
-                } else {
-                    sendToReceiverOrBroadcast(receiver, FAILED_LOGIN, result, provider);
-                }
-                break;
-            case LOG_OUT:
-                if (logOut(provider)) {
-                    sendToReceiverOrBroadcast(receiver, SUCCESSFUL_LOGOUT, Bundle.EMPTY, provider);
-                } else {
-                    sendToReceiverOrBroadcast(receiver, LOGOUT_FAILED, Bundle.EMPTY, provider);
-                }
-                break;
-            case DOWNLOAD_VPN_CERTIFICATE:
-                ProviderObservable.getInstance().setProviderForDns(provider);
-                result = updateVpnCertificate(provider);
-                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
-                    serviceCallback.saveProvider(provider);
-                    ProviderSetupObservable.updateProgress(DOWNLOADED_VPN_CERTIFICATE);
-                    sendToReceiverOrBroadcast(receiver, CORRECTLY_DOWNLOADED_VPN_CERTIFICATE, result, provider);
-                } else {
-                    sendToReceiverOrBroadcast(receiver, INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE, result, provider);
-                }
-                ProviderObservable.getInstance().setProviderForDns(null);
-                break;
-            case QUIETLY_UPDATE_VPN_CERTIFICATE:
-                ProviderObservable.getInstance().setProviderForDns(provider);
-                result = updateVpnCertificate(provider);
-                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
-                    Log.d(TAG, "successfully downloaded VPN certificate");
-                    provider.setShouldUpdateVpnCertificate(false);
-                    PreferenceHelper.storeProviderInPreferences(provider);
-                    ProviderObservable.getInstance().updateProvider(provider);
-                }
-                ProviderObservable.getInstance().setProviderForDns(null);
-                break;
-            case DOWNLOAD_MOTD:
-                MotdClient client = new MotdClient(provider);
-                JSONObject motd = client.fetchJson();
-                if (motd != null) {
-                    provider.setMotdJson(motd);
-                    provider.setLastMotdUpdate(System.currentTimeMillis());
-                }
-                PreferenceHelper.storeProviderInPreferences(provider);
-                ProviderObservable.getInstance().updateProvider(provider);
-                break;
-
-            case UPDATE_INVALID_VPN_CERTIFICATE:
-                ProviderObservable.getInstance().setProviderForDns(provider);
-                result = updateVpnCertificate(provider);
-                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
-                    sendToReceiverOrBroadcast(receiver, CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE, result, provider);
-                } else {
-                    sendToReceiverOrBroadcast(receiver, INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE, result, provider);
-                }
-                ProviderObservable.getInstance().setProviderForDns(null);
-                break;
-            case DOWNLOAD_SERVICE_JSON:
-                ProviderObservable.getInstance().setProviderForDns(provider);
-                Log.d(TAG, "update eip service json");
-                result = getAndSetEipServiceJson(provider);
-                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
-                    sendToReceiverOrBroadcast(receiver, CORRECTLY_DOWNLOADED_EIP_SERVICE, result, provider);
-                } else {
-                    sendToReceiverOrBroadcast(receiver, INCORRECTLY_DOWNLOADED_EIP_SERVICE, result, provider);
-                }
-                ProviderObservable.getInstance().setProviderForDns(null);
-                break;
-            case DOWNLOAD_GEOIP_JSON:
-                if (!provider.getGeoipUrl().isDefault()) {
-                    boolean startEIP = parameters.getBoolean(EIP_ACTION_START);
-                    ProviderObservable.getInstance().setProviderForDns(provider);
-                    result = getGeoIPJson(provider);
-                    result.putBoolean(EIP_ACTION_START, startEIP);
-                    if (result.getBoolean(BROADCAST_RESULT_KEY)) {
-                        sendToReceiverOrBroadcast(receiver, CORRECTLY_DOWNLOADED_GEOIP_JSON, result, provider);
-                    } else {
-                        sendToReceiverOrBroadcast(receiver, INCORRECTLY_DOWNLOADED_GEOIP_JSON, result, provider);
-                    }
-                    ProviderObservable.getInstance().setProviderForDns(null);
-                }
-                break;
-        }
-    }
-
-    private void saveCustomProvider() {
-
-    }
-
-    protected boolean startTorProxy() throws InterruptedException, IllegalStateException, TimeoutException {
-        if (EipStatus.getInstance().isDisconnected() &&
-                PreferenceHelper.getUseSnowflake() &&
-            serviceCallback.startTorService()) {
-            waitForTorCircuits();
-            if (TorStatusObservable.isCancelled()) {
-                throw new InterruptedException("Cancelled Tor setup.");
-            }
-            int port = serviceCallback.getTorHttpTunnelPort();
-            TorStatusObservable.setProxyPort(port);
-            return port != -1;
-        }
-        return false;
-    }
-
-    private void waitForTorCircuits() throws InterruptedException, TimeoutException {
-        if (TorStatusObservable.getStatus() == ON) {
-            return;
-        }
-        TorStatusObservable.waitUntil(this::isTorOnOrCancelled, getTorTimeout());
-    }
-
-    private boolean isTorOnOrCancelled() {
-        return TorStatusObservable.getStatus() == ON || TorStatusObservable.isCancelled();
+        this.eventSender = new ProviderApiEventSender(resources, serviceCallback);
+        this.torHandler = new ProviderApiTorHandler(callback);
     }
 
     void resetProviderDetails(Provider provider) {
@@ -399,502 +95,6 @@ public abstract class ProviderApiManagerBase {
         deleteProviderDetailsFromPreferences(provider.getDomain());
     }
 
-    String formatErrorMessage(final int errorStringId) {
-        return formatErrorMessage(getProviderFormattedString(resources, errorStringId));
-    }
-
-    private String formatErrorMessage(String errorMessage) {
-        return "{ \"" + ERRORS + "\" : \"" + errorMessage + "\" }";
-    }
-
-    private JSONObject getErrorMessageAsJson(final int toastStringId) {
-        try {
-            return new JSONObject(formatErrorMessage(toastStringId));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return new JSONObject();
-        }
-    }
-
-    private void addErrorMessageToJson(JSONObject jsonObject, String errorMessage) {
-        try {
-            jsonObject.put(ERRORS, errorMessage);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void addErrorMessageToJson(JSONObject jsonObject, String errorMessage, String errorId, String initialAction) {
-        try {
-            jsonObject.putOpt(ERRORS, errorMessage);
-            jsonObject.putOpt(ERRORID, errorId);
-            jsonObject.putOpt(INITIAL_ACTION, initialAction);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private Bundle tryToRegister(Provider provider, Bundle task) {
-        Bundle result = new Bundle();
-
-        String username = task.getString(CREDENTIALS_USERNAME);
-        String password = task.getString(CREDENTIALS_PASSWORD);
-
-        if(provider == null) {
-            result.putBoolean(BROADCAST_RESULT_KEY, false);
-            Log.e(TAG, "no provider when trying to register");
-            return result;
-        }
-
-        if (validUserLoginData(username, password)) {
-            result = register(provider, username, password);
-        } else {
-            if (!wellFormedPassword(password)) {
-                result.putBoolean(BROADCAST_RESULT_KEY, false);
-                result.putString(CREDENTIALS_USERNAME, username);
-                result.putBoolean(CREDENTIAL_ERRORS.PASSWORD_INVALID_LENGTH.toString(), true);
-            }
-            if (!validUsername(username)) {
-                result.putBoolean(BROADCAST_RESULT_KEY, false);
-                result.putBoolean(CREDENTIAL_ERRORS.USERNAME_MISSING.toString(), true);
-            }
-        }
-
-        return result;
-    }
-
-    private Bundle register(Provider provider, String username, String password) {
-        JSONObject stepResult = null;
-        OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(provider.getCaCert(), getProxyPort(), stepResult);
-        if (okHttpClient == null) {
-            return backendErrorNotification(stepResult, username);
-        }
-
-        LeapSRPSession client = new LeapSRPSession(username, password);
-        byte[] salt = client.calculateNewSalt();
-
-        BigInteger password_verifier = client.calculateV(username, password, salt);
-
-        JSONObject api_result = sendNewUserDataToSRPServer(provider.getApiUrlWithVersion(), username, new BigInteger(1, salt).toString(16), password_verifier.toString(16), okHttpClient);
-
-        Bundle result = new Bundle();
-        if (api_result.has(ERRORS) || api_result.has(BACKEND_ERROR_KEY))
-            result = backendErrorNotification(api_result, username);
-        else {
-            result.putString(CREDENTIALS_USERNAME, username);
-            result.putString(CREDENTIALS_PASSWORD, password);
-            result.putBoolean(BROADCAST_RESULT_KEY, true);
-        }
-
-        return result;
-    }
-
-    /**
-     * Starts the authentication process using SRP protocol.
-     *
-     * @param task containing: username, password and provider
-     * @return a bundle with a boolean value mapped to a key named BROADCAST_RESULT_KEY, and which is true if authentication was successful.
-     */
-    private Bundle tryToAuthenticate(Provider provider, Bundle task) {
-        Bundle result = new Bundle();
-
-        String username = task.getString(CREDENTIALS_USERNAME);
-        String password = task.getString(CREDENTIALS_PASSWORD);
-
-        if (validUserLoginData(username, password)) {
-            result = authenticate(provider, username, password);
-        } else {
-            if (!wellFormedPassword(password)) {
-                result.putBoolean(BROADCAST_RESULT_KEY, false);
-                result.putString(CREDENTIALS_USERNAME, username);
-                result.putBoolean(CREDENTIAL_ERRORS.PASSWORD_INVALID_LENGTH.toString(), true);
-            }
-            if (!validUsername(username)) {
-                result.putBoolean(BROADCAST_RESULT_KEY, false);
-                result.putBoolean(CREDENTIAL_ERRORS.USERNAME_MISSING.toString(), true);
-            }
-        }
-
-        return result;
-    }
-
-    private Bundle authenticate(Provider provider, String username, String password) {
-        Bundle result = new Bundle();
-        JSONObject stepResult = new JSONObject();
-
-        String providerApiUrl = provider.getApiUrlWithVersion();
-
-        OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(provider.getCaCert(), getProxyPort(), stepResult);
-        if (okHttpClient == null) {
-            return backendErrorNotification(stepResult, username);
-        }
-
-        LeapSRPSession client = new LeapSRPSession(username, password);
-        byte[] A = client.exponential();
-
-        JSONObject step_result = sendAToSRPServer(providerApiUrl, username, new BigInteger(1, A).toString(16), okHttpClient);
-        try {
-            String salt = step_result.getString(LeapSRPSession.SALT);
-            byte[] Bbytes = new BigInteger(step_result.getString("B"), 16).toByteArray();
-            byte[] M1 = client.response(new BigInteger(salt, 16).toByteArray(), Bbytes);
-            if (M1 != null) {
-                step_result = sendM1ToSRPServer(providerApiUrl, username, M1, okHttpClient);
-                setTokenIfAvailable(step_result);
-                byte[] M2 = new BigInteger(step_result.getString(LeapSRPSession.M2), 16).toByteArray();
-                if (client.verify(M2)) {
-                    result.putBoolean(BROADCAST_RESULT_KEY, true);
-                } else {
-                    backendErrorNotification(step_result, username);
-                }
-            } else {
-                result.putBoolean(BROADCAST_RESULT_KEY, false);
-                result.putString(CREDENTIALS_USERNAME, username);
-                result.putString(USER_MESSAGE, resources.getString(R.string.error_srp_math_error_user_message));
-            }
-        } catch (JSONException e) {
-            result = backendErrorNotification(step_result, username);
-            e.printStackTrace();
-        }
-
-        return result;
-    }
-
-    private boolean setTokenIfAvailable(JSONObject authentication_step_result) {
-        try {
-            LeapSRPSession.setToken(authentication_step_result.getString(LeapSRPSession.TOKEN));
-        } catch (JSONException e) {
-            return false;
-        }
-        return true;
-    }
-
-    private Bundle backendErrorNotification(JSONObject result, String username) {
-        Bundle userNotificationBundle = new Bundle();
-        if (result.has(ERRORS)) {
-            Object baseErrorMessage = result.opt(ERRORS);
-            if (baseErrorMessage instanceof JSONObject) {
-                try {
-                    JSONObject errorMessage = result.getJSONObject(ERRORS);
-                    String errorType = errorMessage.keys().next().toString();
-                    String message = errorMessage.get(errorType).toString();
-                    userNotificationBundle.putString(USER_MESSAGE, message);
-                } catch (JSONException | NoSuchElementException | NullPointerException e) {
-                    e.printStackTrace();
-                }
-            } else if (baseErrorMessage instanceof String) {
-                try {
-                    String errorMessage = result.getString(ERRORS);
-                    userNotificationBundle.putString(USER_MESSAGE, errorMessage);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-            }
-        } else if (result.has(BACKEND_ERROR_KEY)) {
-            try {
-                String backendErrorMessage = resources.getString(R.string.error_json_exception_user_message);
-                if (result.has(BACKEND_ERROR_MESSAGE)) {
-                    backendErrorMessage = resources.getString(R.string.error) + result.getString(BACKEND_ERROR_MESSAGE);
-                }
-                userNotificationBundle.putString(USER_MESSAGE, backendErrorMessage);
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        }
-
-        if (!username.isEmpty())
-            userNotificationBundle.putString(CREDENTIALS_USERNAME, username);
-        userNotificationBundle.putBoolean(BROADCAST_RESULT_KEY, false);
-
-        return userNotificationBundle;
-    }
-
-    private void sendToReceiverOrBroadcast(ResultReceiver receiver, int resultCode, Bundle resultData, Provider provider) {
-        if (resultData == null || resultData == Bundle.EMPTY) {
-            resultData = new Bundle();
-        }
-        resultData.putParcelable(PROVIDER_KEY, provider);
-        if (receiver != null) {
-            receiver.send(resultCode, resultData);
-        } else {
-            broadcastEvent(resultCode, resultData);
-        }
-        handleEventSummaryErrorLog(resultCode);
-    }
-
-    private void broadcastEvent(int resultCode , Bundle resultData) {
-        Intent intentUpdate = new Intent(BROADCAST_PROVIDER_API_EVENT);
-        intentUpdate.addCategory(Intent.CATEGORY_DEFAULT);
-        intentUpdate.putExtra(BROADCAST_RESULT_CODE, resultCode);
-        intentUpdate.putExtra(BROADCAST_RESULT_KEY, resultData);
-        serviceCallback.broadcastEvent(intentUpdate);
-    }
-
-    private void handleEventSummaryErrorLog(int resultCode) {
-        String event = null;
-        switch (resultCode) {
-            case FAILED_LOGIN:
-                event = "login.";
-                break;
-            case FAILED_SIGNUP:
-                event = "signup.";
-                break;
-            case SUCCESSFUL_LOGOUT:
-                event = "logout.";
-                break;
-            case INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE:
-                event = "download of vpn certificate.";
-                break;
-            case PROVIDER_NOK:
-                event = "setup or update provider details.";
-                break;
-            case INCORRECTLY_DOWNLOADED_EIP_SERVICE:
-                event = "update eip-service.json";
-                break;
-            case INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE:
-                event = "update invalid vpn certificate.";
-                break;
-            case INCORRECTLY_DOWNLOADED_GEOIP_JSON:
-                event = "download menshen service json.";
-                break;
-            case TOR_TIMEOUT:
-            case TOR_EXCEPTION:
-                event = "start tor for censorship circumvention";
-                break;
-            default:
-                break;
-        }
-        if (event != null) {
-            VpnStatus.logWarning("[API] failed provider API event: " + event);
-        }
-    }
-
-    /**
-     * Validates parameters entered by the user to log in
-     *
-     * @param username
-     * @param password
-     * @return true if both parameters are present and the entered password length is greater or equal to eight (8).
-     */
-    private boolean validUserLoginData(String username, String password) {
-        return validUsername(username) && wellFormedPassword(password);
-    }
-
-    private boolean validUsername(String username) {
-        return username != null && !username.isEmpty();
-    }
-
-    /**
-     * Validates a password
-     *
-     * @param password
-     * @return true if the entered password length is greater or equal to eight (8).
-     */
-    private boolean wellFormedPassword(String password) {
-        return password != null && password.length() >= 8;
-    }
-
-    /**
-     * Sends an HTTP POST request to the authentication server with the SRP Parameter A.
-     *
-     * @param server_url
-     * @param username
-     * @param clientA    First SRP parameter sent
-     * @param okHttpClient
-     * @return response from authentication server
-     */
-    private JSONObject sendAToSRPServer(String server_url, String username, String clientA, OkHttpClient okHttpClient) {
-        SrpCredentials srpCredentials = new SrpCredentials(username, clientA);
-        return sendToServer(server_url + "/sessions.json", "POST", srpCredentials.toString(), okHttpClient);
-    }
-
-    /**
-     * Sends an HTTP PUT request to the authentication server with the SRP Parameter M1 (or simply M).
-     *
-     * @param server_url
-     * @param username
-     * @param m1         Second SRP parameter sent
-     * @param okHttpClient
-     * @return response from authentication server
-     */
-    private JSONObject sendM1ToSRPServer(String server_url, String username, byte[] m1, OkHttpClient okHttpClient) {
-        String m1json = "{\"client_auth\":\"" + new BigInteger(1, ConfigHelper.trim(m1)).toString(16)+ "\"}";
-        return sendToServer(server_url + "/sessions/" + username + ".json", "PUT", m1json, okHttpClient);
-    }
-
-    /**
-     * Sends an HTTP POST request to the api server to register a new user.
-     *
-     * @param server_url
-     * @param username
-     * @param salt
-     * @param password_verifier
-     * @param okHttpClient
-     * @return response from authentication server
-     */
-    private JSONObject sendNewUserDataToSRPServer(String server_url, String username, String salt, String password_verifier, OkHttpClient okHttpClient) {
-        return sendToServer(server_url + "/users.json", "POST", new SrpRegistrationData(username, salt, password_verifier).toString(), okHttpClient);
-    }
-
-    /**
-     * Executes an HTTP request expecting a JSON response.
-     *
-     * @param url
-     * @param request_method
-     * @return response from authentication server
-     */
-    private JSONObject sendToServer(String url, String request_method, String jsonString, OkHttpClient okHttpClient) {
-        return requestJsonFromServer(url, request_method, jsonString, new ArrayList<Pair<String, String>>(), okHttpClient);
-    }
-
-    protected String sendGetStringToServer(@NonNull String url, @NonNull List<Pair<String, String>> headerArgs, @NonNull OkHttpClient okHttpClient) {
-        return requestStringFromServer(url, "GET", null, headerArgs, okHttpClient);
-    }
-
-
-
-    private JSONObject requestJsonFromServer(@NonNull String url, @NonNull String request_method, String jsonString, @NonNull List<Pair<String, String>> headerArgs, @NonNull OkHttpClient okHttpClient)  {
-        JSONObject responseJson;
-        String plain_response = requestStringFromServer(url, request_method, jsonString, headerArgs, okHttpClient);
-
-        try {
-            responseJson = new JSONObject(plain_response);
-        } catch (NullPointerException | JSONException e) {
-            e.printStackTrace();
-            responseJson = getErrorMessageAsJson(error_json_exception_user_message);
-            VpnStatus.logWarning("[API] got null response for request: " + url);
-        }
-        return responseJson;
-
-    }
-
-    private String requestStringFromServer(@NonNull String url, @NonNull String request_method, String jsonString, @NonNull List<Pair<String, String>> headerArgs, @NonNull OkHttpClient okHttpClient) {
-        String plainResponseBody;
-
-        try {
-
-            plainResponseBody = ProviderApiConnector.requestStringFromServer(url, request_method, jsonString, headerArgs, okHttpClient);
-
-        } catch (NullPointerException npe) {
-            plainResponseBody = formatErrorMessage(error_json_exception_user_message);
-            VpnStatus.logWarning("[API] Null response body for request " + url + ": " + npe.getLocalizedMessage());
-        } catch (UnknownHostException | SocketTimeoutException e) {
-            plainResponseBody = formatErrorMessage(server_unreachable_message);
-            VpnStatus.logWarning("[API] UnknownHostException or SocketTimeoutException for request " + url + ": " + e.getLocalizedMessage());
-        } catch (MalformedURLException e) {
-            plainResponseBody = formatErrorMessage(malformed_url);
-            VpnStatus.logWarning("[API] MalformedURLException for request " + url + ": " + e.getLocalizedMessage());
-        } catch (SSLHandshakeException | SSLPeerUnverifiedException e) {
-            plainResponseBody = formatErrorMessage(certificate_error);
-            VpnStatus.logWarning("[API] SSLHandshakeException or SSLPeerUnverifiedException for request " + url + ": " + e.getLocalizedMessage());
-        } catch (ConnectException e) {
-            plainResponseBody = formatErrorMessage(service_is_down_error);
-            VpnStatus.logWarning("[API] ConnectException for request " + url + ": " + e.getLocalizedMessage());
-        } catch (IllegalArgumentException e) {
-            plainResponseBody = formatErrorMessage(error_no_such_algorithm_exception_user_message);
-            VpnStatus.logWarning("[API] IllegalArgumentException for request " + url + ": " + e.getLocalizedMessage());
-        } catch (UnknownServiceException e) {
-            //unable to find acceptable protocols - tlsv1.2 not enabled?
-            plainResponseBody = formatErrorMessage(error_no_such_algorithm_exception_user_message);
-            VpnStatus.logWarning("[API] UnknownServiceException for request " + url + ": " + e.getLocalizedMessage());
-        } catch (IOException e) {
-            plainResponseBody = formatErrorMessage(error_io_exception_user_message);
-            VpnStatus.logWarning("[API] IOException for request " + url + ": " + e.getLocalizedMessage());
-        }
-
-        return plainResponseBody;
-    }
-
-    private boolean canConnect(Provider provider, Bundle result) {
-        return canConnect(provider, result, 0);
-    }
-
-    private boolean canConnect(Provider provider, Bundle result, int tries) {
-        JSONObject errorJson = new JSONObject();
-        String providerUrl = provider.getApiUrlString() + "/provider.json";
-
-        OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(provider.getCaCert(), getProxyPort(), errorJson);
-        if (okHttpClient == null) {
-            result.putString(ERRORS, errorJson.toString());
-            return false;
-        }
-
-        if (tries > 0) {
-            result.remove(ERRORS);
-        }
-
-        try {
-            return ProviderApiConnector.canConnect(okHttpClient, providerUrl);
-
-        }  catch (UnknownHostException | SocketTimeoutException e) {
-            VpnStatus.logWarning("[API] UnknownHostException or SocketTimeoutException during connection check: " + e.getLocalizedMessage());
-            setErrorResult(result, server_unreachable_message, null);
-        } catch (MalformedURLException e) {
-            VpnStatus.logWarning("[API] MalformedURLException during connection check: " + e.getLocalizedMessage());
-            setErrorResult(result, malformed_url, null);
-        } catch (SSLHandshakeException e) {
-            VpnStatus.logWarning("[API] SSLHandshakeException during connection check: " + e.getLocalizedMessage());
-            setErrorResult(result, warning_corrupted_provider_cert, ERROR_INVALID_CERTIFICATE.toString());
-        } catch (ConnectException e) {
-            VpnStatus.logWarning("[API] ConnectException during connection check: " + e.getLocalizedMessage());
-            setErrorResult(result, service_is_down_error, null);
-        } catch (IllegalArgumentException e) {
-            VpnStatus.logWarning("[API] IllegalArgumentException during connection check: " + e.getLocalizedMessage());
-            setErrorResult(result, error_no_such_algorithm_exception_user_message, null);
-        } catch (UnknownServiceException e) {
-            VpnStatus.logWarning("[API] UnknownServiceException during connection check: " + e.getLocalizedMessage());
-            //unable to find acceptable protocols - tlsv1.2 not enabled?
-            setErrorResult(result, error_no_such_algorithm_exception_user_message, null);
-        } catch (IOException e) {
-            VpnStatus.logWarning("[API] IOException during connection check: " + e.getLocalizedMessage());
-            setErrorResult(result, error_io_exception_user_message, null);
-        }
-
-        try {
-            if (tries == 0 &&
-                    result.containsKey(ERRORS) &&
-                    TorStatusObservable.getStatus() == OFF &&
-                    startTorProxy()
-            ) {
-                return canConnect(provider, result, 1);
-            }
-        } catch (InterruptedException | IllegalStateException | TimeoutException e) {
-            e.printStackTrace();
-        }
-
-        return false;
-    }
-
-    /**
-     * Downloads a provider.json from a given URL, adding a new provider using the given name.
-     *
-     * @param task containing a boolean meaning if the provider is custom or not, another boolean meaning if the user completely trusts this provider
-     * @return a bundle with a boolean value mapped to a key named BROADCAST_RESULT_KEY, and which is true if the update was successful.
-     */
-    protected abstract Bundle setUpProvider(Provider provider, Bundle task);
-
-    /**
-     * Downloads the eip-service.json from a given URL, and saves eip service capabilities including the offered gateways
-     * @return a bundle with a boolean value mapped to a key named BROADCAST_RESULT_KEY, and which is true if the download was successful.
-     */
-    protected abstract Bundle getAndSetEipServiceJson(Provider provider);
-
-    /**
-     * Downloads a new OpenVPN certificate, attaching authenticated cookie for authenticated certificate.
-     *
-     * @return true if certificate was downloaded correctly, false if provider.json is not present in SharedPreferences, or if the certificate url could not be parsed as a URI, or if there was an SSL error.
-     */
-    protected abstract Bundle updateVpnCertificate(Provider provider);
-
-
-    /**
-     * Fetches the Geo ip Json, containing a list of gateways sorted by distance from the users current location
-     *
-     * @param provider
-     * @return
-     */
-    protected abstract Bundle getGeoIPJson(Provider provider);
-
-
     protected boolean isValidJson(String jsonString) {
         try {
             new JSONObject(jsonString);
@@ -953,99 +153,7 @@ public abstract class ProviderApiManagerBase {
         }
     }
 
-    Bundle validateProviderDetails(Provider provider) {
-        Bundle result = new Bundle();
-        result.putBoolean(BROADCAST_RESULT_KEY, false);
 
-        if (!provider.hasDefinition()) {
-            return result;
-        }
-
-        result = validateCertificateForProvider(result, provider);
-
-        //invalid certificate or no certificate or unable to connect due other connectivity issues
-        if (result.containsKey(ERRORS) || (result.containsKey(BROADCAST_RESULT_KEY) && !result.getBoolean(BROADCAST_RESULT_KEY)) ) {
-            return result;
-        }
-
-        result.putBoolean(BROADCAST_RESULT_KEY, true);
-
-        return result;
-    }
-
-    protected Bundle validateCertificateForProvider(Bundle result, Provider provider) {
-        String caCert = provider.getCaCert();
-
-        if (ConfigHelper.checkErroneousDownload(caCert)) {
-            VpnStatus.logWarning("[API] No provider cert.");
-            return result;
-        }
-
-        ArrayList<X509Certificate> certificates = ConfigHelper.parseX509CertificatesFromString(caCert);
-        if (certificates == null) {
-            return setErrorResult(result, warning_corrupted_provider_cert, ERROR_INVALID_CERTIFICATE.toString());
-        }
-        try {
-            String encoding = provider.getCertificatePinEncoding();
-            String expectedFingerprint = provider.getCertificatePin();
-
-            // Do certificate pinning only if we have 1 cert, otherwise we assume some transitioning of
-            // X509 certs, therefore we cannot do cert pinning
-            if (certificates.size() == 1) {
-                String realFingerprint = getFingerprintFromCertificate(certificates.get(0), encoding);
-                if (!realFingerprint.trim().equalsIgnoreCase(expectedFingerprint.trim())) {
-                    return setErrorResult(result, warning_corrupted_provider_cert, ERROR_CERTIFICATE_PINNING.toString());
-                }
-            }
-            for (X509Certificate certificate : certificates) {
-                certificate.checkValidity();
-            }
-
-            if (!canConnect(provider, result)) {
-                return result;
-            }
-        } catch (NoSuchAlgorithmException e ) {
-            return setErrorResult(result, error_no_such_algorithm_exception_user_message, null);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return setErrorResult(result, warning_corrupted_provider_details, ERROR_CORRUPTED_PROVIDER_JSON.toString());
-        } catch (CertificateEncodingException | CertificateNotYetValidException | CertificateExpiredException e) {
-            return setErrorResult(result, warning_expired_provider_cert, ERROR_INVALID_CERTIFICATE.toString());
-        }
-
-        result.putBoolean(BROADCAST_RESULT_KEY, true);
-        return result;
-    }
-
-    protected Bundle setErrorResult(Bundle result, String stringJsonErrorMessage) {
-        String reasonToFail = pickErrorMessage(stringJsonErrorMessage);
-        VpnStatus.logWarning("[API] error: " + reasonToFail);
-        result.putString(ERRORS, reasonToFail);
-        result.putBoolean(BROADCAST_RESULT_KEY, false);
-        return result;
-    }
-
-    Bundle setErrorResultAction(Bundle result, String initialAction) {
-        JSONObject errorJson = new JSONObject();
-        addErrorMessageToJson(errorJson, null, null, initialAction);
-        VpnStatus.logWarning("[API] error: " + initialAction + " failed.");
-        result.putString(ERRORS, errorJson.toString());
-        result.putBoolean(BROADCAST_RESULT_KEY, false);
-        return result;
-    }
-
-    Bundle setErrorResult(Bundle result, int errorMessageId, String errorId) {
-        return setErrorResult(result, errorMessageId, errorId, null);
-    }
-
-    Bundle setErrorResult(Bundle result, int errorMessageId, String errorId, String initialAction) {
-        JSONObject errorJson = new JSONObject();
-        String errorMessage = getProviderFormattedString(resources, errorMessageId);
-        addErrorMessageToJson(errorJson, errorMessage, errorId, initialAction);
-        VpnStatus.logWarning("[API] error: " + errorMessage);
-        result.putString(ERRORS, errorJson.toString());
-        result.putBoolean(BROADCAST_RESULT_KEY, false);
-        return result;
-    }
 
     protected String getPersistedPrivateKey(String providerDomain) {
         return getFromPersistedProvider(PROVIDER_PRIVATE_KEY, providerDomain);
@@ -1105,61 +213,10 @@ public abstract class ProviderApiManagerBase {
         return PreferenceHelper.hasKey(Provider.KEY + "." + domain) && PreferenceHelper.hasKey(CA_CERT + "." + domain);
     }
 
-    /**
-     * Interprets the error message as a JSON object and extract the "errors" keyword pair.
-     * If the error message is not a JSON object, then it is returned untouched.
-     *
-     * @param stringJsonErrorMessage
-     * @return final error message
-     */
-    protected String pickErrorMessage(String stringJsonErrorMessage) {
-        String errorMessage = "";
-        try {
-            JSONObject jsonErrorMessage = new JSONObject(stringJsonErrorMessage);
-            errorMessage = jsonErrorMessage.getString(ERRORS);
-        } catch (JSONException e) {
-            // TODO Auto-generated catch block
-            errorMessage = stringJsonErrorMessage;
-        } catch (NullPointerException e) {
-            //do nothing
-        }
-
-        return errorMessage;
-    }
-
-    @NonNull
-    protected List<Pair<String, String>> getAuthorizationHeader() {
-        List<Pair<String, String>> headerArgs = new ArrayList<>();
-        if (!LeapSRPSession.getToken().isEmpty()) {
-            Pair<String, String> authorizationHeaderPair = new Pair<>(LeapSRPSession.AUTHORIZATION_HEADER, "Token token=" + LeapSRPSession.getToken());
-            headerArgs.add(authorizationHeaderPair);
-        }
-        return headerArgs;
-    }
-
-    private boolean logOut(Provider provider) {
-        OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(provider.getCaCert(), getProxyPort(), new JSONObject());
-        if (okHttpClient == null) {
-            return false;
-        }
-
-        String deleteUrl = provider.getApiUrlWithVersion() + "/logout";
-
-        try {
-            if (ProviderApiConnector.delete(okHttpClient, deleteUrl)) {
-                LeapSRPSession.setToken("");
-                return true;
-            }
-        } catch (IOException e) {
-            // eat me
-        }
-        return false;
-    }
-
     protected Bundle loadCertificate(Provider provider, String certString) {
         Bundle result = new Bundle();
         if (certString == null) {
-            setErrorResult(result, vpn_certificate_is_invalid, null);
+            eventSender.setErrorResult(result, vpn_certificate_is_invalid, null);
             return result;
         }
 
@@ -1186,7 +243,7 @@ public abstract class ProviderApiManagerBase {
             result.putBoolean(BROADCAST_RESULT_KEY, true);
         } catch (CertificateException | NullPointerException e) {
             e.printStackTrace();
-            setErrorResult(result, vpn_certificate_is_invalid, null);
+            eventSender.setErrorResult(result, vpn_certificate_is_invalid, null);
         }
         return result;
     }
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerFactory.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerFactory.java
new file mode 100644
index 00000000..5abec0af
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerFactory.java
@@ -0,0 +1,27 @@
+package se.leap.bitmaskclient.providersetup;
+
+import android.content.res.Resources;
+
+import se.leap.bitmaskclient.base.models.Provider;
+import se.leap.bitmaskclient.providersetup.connectivity.OkHttpClientGenerator;
+
+public class ProviderApiManagerFactory {
+    private final Resources resources;
+    private final ProviderApiManagerBase.ProviderApiServiceCallback callback;
+    private static final String TAG = ProviderApiManagerFactory.class.getSimpleName();
+
+    public ProviderApiManagerFactory(Resources resources, ProviderApiManagerBase.ProviderApiServiceCallback callback) {
+        this.resources = resources;
+        this.callback = callback;
+    }
+
+    public IProviderApiManager getProviderApiManager(Provider provider) throws IllegalArgumentException {
+        switch (provider.getApiVersion()) {
+            case "5":
+                return new ProviderApiManagerV5(resources, callback);
+            default:
+                OkHttpClientGenerator clientGenerator = new OkHttpClientGenerator(resources);
+                return new ProviderApiManagerV3(resources, clientGenerator, callback);
+        }
+    }
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV3.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV3.java
new file mode 100644
index 00000000..a63899c0
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV3.java
@@ -0,0 +1,725 @@
+/**
+ * Copyright (c) 2018 LEAP Encryption Access Project and contributers
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package se.leap.bitmaskclient.providersetup;
+
+import static android.text.TextUtils.isEmpty;
+import static se.leap.bitmaskclient.BuildConfig.DEBUG_MODE;
+import static se.leap.bitmaskclient.R.string.certificate_error;
+import static se.leap.bitmaskclient.R.string.downloading_vpn_certificate_failed;
+import static se.leap.bitmaskclient.R.string.error_io_exception_user_message;
+import static se.leap.bitmaskclient.R.string.error_json_exception_user_message;
+import static se.leap.bitmaskclient.R.string.error_no_such_algorithm_exception_user_message;
+import static se.leap.bitmaskclient.R.string.malformed_url;
+import static se.leap.bitmaskclient.R.string.server_unreachable_message;
+import static se.leap.bitmaskclient.R.string.service_is_down_error;
+import static se.leap.bitmaskclient.R.string.setup_error_text;
+import static se.leap.bitmaskclient.R.string.setup_error_text_custom;
+import static se.leap.bitmaskclient.R.string.warning_corrupted_provider_cert;
+import static se.leap.bitmaskclient.R.string.warning_corrupted_provider_details;
+import static se.leap.bitmaskclient.R.string.warning_expired_provider_cert;
+import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_KEY;
+import static se.leap.bitmaskclient.base.models.Constants.EIP_ACTION_START;
+import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_KEY;
+import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.base.utils.BuildConfigHelper.isDefaultBitmask;
+import static se.leap.bitmaskclient.base.utils.CertificateHelper.getFingerprintFromCertificate;
+import static se.leap.bitmaskclient.base.utils.ConfigHelper.getProviderFormattedString;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_DOWNLOADED_EIP_SERVICE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_DOWNLOADED_GEOIP_JSON;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_DOWNLOADED_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_GEOIP_JSON;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_MOTD;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_SERVICE_JSON;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.ERRORS;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_EIP_SERVICE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_GEOIP_JSON;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.PROVIDER_NOK;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.PROVIDER_OK;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.QUIETLY_UPDATE_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.SET_UP_PROVIDER;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_CERTIFICATE_PINNING;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_CORRUPTED_PROVIDER_JSON;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_INVALID_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_CA_CERT;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_EIP_SERVICE_JSON;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_GEOIP_JSON;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_PROVIDER_JSON;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.OFF;
+import static se.leap.bitmaskclient.tor.TorStatusObservable.getProxyPort;
+
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.ResultReceiver;
+import android.util.Log;
+import android.util.Pair;
+
+import androidx.annotation.NonNull;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.net.UnknownServiceException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLPeerUnverifiedException;
+
+import de.blinkt.openvpn.core.VpnStatus;
+import okhttp3.OkHttpClient;
+import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.base.models.Provider;
+import se.leap.bitmaskclient.base.models.ProviderObservable;
+import se.leap.bitmaskclient.base.utils.ConfigHelper;
+import se.leap.bitmaskclient.base.utils.PreferenceHelper;
+import se.leap.bitmaskclient.eip.EIP;
+import se.leap.bitmaskclient.motd.MotdClient;
+import se.leap.bitmaskclient.providersetup.connectivity.OkHttpClientGenerator;
+import se.leap.bitmaskclient.providersetup.models.LeapSRPSession;
+import se.leap.bitmaskclient.tor.TorStatusObservable;
+
+/**
+ * Implements the logic of the provider api http requests. The methods of this class need to be called from
+ * a background thread.
+ */
+
+
+public class ProviderApiManagerV3 extends ProviderApiManagerBase implements IProviderApiManager {
+
+    private static final String TAG = ProviderApiManagerV3.class.getSimpleName();
+
+    OkHttpClientGenerator clientGenerator;
+
+    public ProviderApiManagerV3(Resources resources, OkHttpClientGenerator clientGenerator, ProviderApiServiceCallback callback) {
+        super(resources, callback);
+        this.clientGenerator = clientGenerator;
+    }
+
+    @Override
+    public void handleAction(String action, Provider provider, Bundle parameters, ResultReceiver receiver) {
+        Bundle result = new Bundle();
+        switch (action) {
+            case SET_UP_PROVIDER:
+                ProviderObservable.getInstance().setProviderForDns(provider);
+                result = setupProvider(provider, parameters);
+                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                    getGeoIPJson(provider);
+                    if (provider.hasGeoIpJson()) {
+                        ProviderSetupObservable.updateProgress(DOWNLOADED_GEOIP_JSON);
+                    }
+                    eventSender.sendToReceiverOrBroadcast(receiver, PROVIDER_OK, result, provider);
+                } else {
+                    eventSender.sendToReceiverOrBroadcast(receiver, PROVIDER_NOK, result, provider);
+                }
+                ProviderObservable.getInstance().setProviderForDns(null);
+                break;
+            case DOWNLOAD_VPN_CERTIFICATE:
+                ProviderObservable.getInstance().setProviderForDns(provider);
+                result = updateVpnCertificate(provider);
+                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                    serviceCallback.saveProvider(provider);
+                    ProviderSetupObservable.updateProgress(DOWNLOADED_VPN_CERTIFICATE);
+                    eventSender.sendToReceiverOrBroadcast(receiver, CORRECTLY_DOWNLOADED_VPN_CERTIFICATE, result, provider);
+                } else {
+                    eventSender.sendToReceiverOrBroadcast(receiver, INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE, result, provider);
+                }
+                ProviderObservable.getInstance().setProviderForDns(null);
+                break;
+            case QUIETLY_UPDATE_VPN_CERTIFICATE:
+                ProviderObservable.getInstance().setProviderForDns(provider);
+                result = updateVpnCertificate(provider);
+                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                    Log.d(TAG, "successfully downloaded VPN certificate");
+                    provider.setShouldUpdateVpnCertificate(false);
+                    PreferenceHelper.storeProviderInPreferences(provider);
+                    ProviderObservable.getInstance().updateProvider(provider);
+                }
+                ProviderObservable.getInstance().setProviderForDns(null);
+                break;
+            case DOWNLOAD_MOTD:
+                MotdClient client = new MotdClient(provider);
+                JSONObject motd = client.fetchJson();
+                if (motd != null) {
+                    provider.setMotdJson(motd);
+                    provider.setLastMotdUpdate(System.currentTimeMillis());
+                }
+                PreferenceHelper.storeProviderInPreferences(provider);
+                ProviderObservable.getInstance().updateProvider(provider);
+                break;
+
+            case UPDATE_INVALID_VPN_CERTIFICATE:
+                ProviderObservable.getInstance().setProviderForDns(provider);
+                result = updateVpnCertificate(provider);
+                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                    eventSender.sendToReceiverOrBroadcast(receiver, CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE, result, provider);
+                } else {
+                    eventSender.sendToReceiverOrBroadcast(receiver, INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE, result, provider);
+                }
+                ProviderObservable.getInstance().setProviderForDns(null);
+                break;
+            case DOWNLOAD_SERVICE_JSON:
+                ProviderObservable.getInstance().setProviderForDns(provider);
+                Log.d(TAG, "update eip service json");
+                result = getAndSetEipServiceJson(provider);
+                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                    eventSender.sendToReceiverOrBroadcast(receiver, CORRECTLY_DOWNLOADED_EIP_SERVICE, result, provider);
+                } else {
+                    eventSender.sendToReceiverOrBroadcast(receiver, INCORRECTLY_DOWNLOADED_EIP_SERVICE, result, provider);
+                }
+                ProviderObservable.getInstance().setProviderForDns(null);
+                break;
+            case DOWNLOAD_GEOIP_JSON:
+                if (!provider.getGeoipUrl().isDefault()) {
+                    boolean startEIP = parameters.getBoolean(EIP_ACTION_START);
+                    ProviderObservable.getInstance().setProviderForDns(provider);
+                    result = getGeoIPJson(provider);
+                    result.putBoolean(EIP_ACTION_START, startEIP);
+                    if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                        eventSender.sendToReceiverOrBroadcast(receiver, CORRECTLY_DOWNLOADED_GEOIP_JSON, result, provider);
+                    } else {
+                        eventSender.sendToReceiverOrBroadcast(receiver, INCORRECTLY_DOWNLOADED_GEOIP_JSON, result, provider);
+                    }
+                    ProviderObservable.getInstance().setProviderForDns(null);
+                }
+                break;
+        }
+    }
+
+    /**
+     * Downloads a provider.json from a given URL, adding a new provider using the given name.
+     *
+     * @param task containing a boolean meaning if the provider is custom or not, another boolean meaning if the user completely trusts this provider, the provider name and its provider.json url.
+     * @return a bundle with a boolean value mapped to a key named BROADCAST_RESULT_KEY, and which is true if the update was successful.
+     */
+    public Bundle setupProvider(Provider provider, Bundle task) {
+        Bundle currentDownload = new Bundle();
+
+        if (isEmpty(provider.getMainUrlString()) || provider.getMainUrl().isDefault()) {
+            currentDownload.putBoolean(BROADCAST_RESULT_KEY, false);
+            eventSender.setErrorResult(currentDownload, malformed_url, null);
+            VpnStatus.logWarning("[API] MainURL String is not set. Cannot setup provider.");
+            return currentDownload;
+        }
+
+        getPersistedProviderUpdates(provider);
+        currentDownload = validateProviderDetails(provider);
+
+        //provider certificate invalid
+        if (currentDownload.containsKey(ERRORS)) {
+            currentDownload.putParcelable(PROVIDER_KEY, provider);
+            return currentDownload;
+        }
+
+        //no provider json or certificate available
+        if (currentDownload.containsKey(BROADCAST_RESULT_KEY) && !currentDownload.getBoolean(BROADCAST_RESULT_KEY)) {
+            resetProviderDetails(provider);
+        }
+
+        currentDownload = getAndSetProviderJson(provider);
+        if (provider.hasDefinition() || (currentDownload.containsKey(BROADCAST_RESULT_KEY) && currentDownload.getBoolean(BROADCAST_RESULT_KEY))) {
+            ProviderSetupObservable.updateProgress(DOWNLOADED_PROVIDER_JSON);
+            if (!provider.hasCaCert()) {
+                currentDownload = downloadCACert(provider);
+            }
+            if (provider.hasCaCert() || (currentDownload.containsKey(BROADCAST_RESULT_KEY) && currentDownload.getBoolean(BROADCAST_RESULT_KEY))) {
+                ProviderSetupObservable.updateProgress(DOWNLOADED_CA_CERT);
+                currentDownload = getAndSetEipServiceJson(provider);
+            }
+
+            if (provider.hasEIP() && !provider.allowsRegistered() && !provider.allowsAnonymous()) {
+                eventSender.setErrorResult(currentDownload, isDefaultBitmask() ? setup_error_text : setup_error_text_custom, null);
+            } else if (provider.hasEIP()) {
+                ProviderSetupObservable.updateProgress(DOWNLOADED_EIP_SERVICE_JSON);
+            }
+        }
+
+        return currentDownload;
+    }
+
+    private Bundle getAndSetProviderJson(Provider provider) {
+        Bundle result = new Bundle();
+
+        String providerDotJsonString;
+        if(provider.getDefinitionString().length() == 0 || provider.getCaCert().isEmpty()) {
+            String providerJsonUrl = provider.getMainUrlString() + "/provider.json";
+            providerDotJsonString = downloadWithCommercialCA(providerJsonUrl, provider);
+        } else {
+            providerDotJsonString = downloadFromApiUrlWithProviderCA("/provider.json", provider);
+        }
+
+        if (ConfigHelper.checkErroneousDownload(providerDotJsonString) || !isValidJson(providerDotJsonString)) {
+            eventSender.setErrorResult(result, malformed_url, null);
+            return result;
+        }
+
+        if (DEBUG_MODE) {
+            VpnStatus.logDebug("[API] PROVIDER JSON: " + providerDotJsonString);
+        }
+        try {
+            JSONObject providerJson = new JSONObject(providerDotJsonString);
+
+            if (provider.define(providerJson)) {
+                result.putBoolean(BROADCAST_RESULT_KEY, true);
+            } else {
+                return eventSender.setErrorResult(result, warning_corrupted_provider_details, ERROR_CORRUPTED_PROVIDER_JSON.toString());
+            }
+
+        } catch (JSONException e) {
+            eventSender.setErrorResult(result, providerDotJsonString);
+        }
+        return result;
+    }
+
+    /**
+     * Downloads the eip-service.json from a given URL, and saves eip service capabilities including the offered gateways
+     * @return a bundle with a boolean value mapped to a key named BROADCAST_RESULT_KEY, and which is true if the download was successful.
+     */
+    private Bundle getAndSetEipServiceJson(Provider provider) {
+        Bundle result = new Bundle();
+        String eipServiceJsonString = "";
+        try {
+            String eipServiceUrl = provider.getApiUrlWithVersion() + "/" + EIP.SERVICE_API_PATH;
+            eipServiceJsonString = downloadWithProviderCA(provider.getCaCert(), eipServiceUrl);
+            if (DEBUG_MODE) {
+                VpnStatus.logDebug("[API] EIP SERVICE JSON: " + eipServiceJsonString);
+            }
+            JSONObject eipServiceJson = new JSONObject(eipServiceJsonString);
+            if (eipServiceJson.has(ERRORS)) {
+                eventSender.setErrorResult(result, eipServiceJsonString);
+            } else {
+                provider.setEipServiceJson(eipServiceJson);
+                provider.setLastEipServiceUpdate(System.currentTimeMillis());
+                result.putBoolean(BROADCAST_RESULT_KEY, true);
+            }
+        } catch (NullPointerException | JSONException e) {
+            eventSender.setErrorResult(result, R.string.error_json_exception_user_message, null);
+        }
+        return result;
+    }
+
+    /**
+     * Downloads a new OpenVPN certificate, attaching authenticated cookie for authenticated certificate.
+     *
+     * @return true if certificate was downloaded correctly, false if provider.json is not present in SharedPreferences, or if the certificate url could not be parsed as a URI, or if there was an SSL error.
+     */
+    protected Bundle updateVpnCertificate(Provider provider) {
+        Bundle result = new Bundle();
+        String certString = downloadFromVersionedApiUrlWithProviderCA("/" + PROVIDER_VPN_CERTIFICATE, provider);
+        if (DEBUG_MODE) {
+            VpnStatus.logDebug("[API] VPN CERT: " + certString);
+        }
+        if (ConfigHelper.checkErroneousDownload(certString)) {
+            if (TorStatusObservable.isRunning()) {
+                eventSender.setErrorResult(result, downloading_vpn_certificate_failed, null);
+            } else if (certString == null || certString.isEmpty() ){
+                // probably 204
+                eventSender.setErrorResult(result, error_io_exception_user_message, null);
+            } else {
+                eventSender.setErrorResult(result, certString);
+            }
+            return result;
+        }
+        return loadCertificate(provider, certString);
+    }
+
+    /**
+     * Fetches the geo ip Json, containing a list of gateways sorted by distance from the users current location.
+     * Fetching is only allowed if the cache timeout of 1 h was reached, a valid geoip service URL exists and the
+     * vpn or tor is not running. The latter condition is needed in order to guarantee that the geoip service sees
+     * the real ip of the client
+     *
+     * @param provider
+     * @return
+     */
+    private Bundle getGeoIPJson(Provider provider) {
+        Bundle result = new Bundle();
+
+        if (!provider.shouldUpdateGeoIpJson() || provider.getGeoipUrl().isDefault() || VpnStatus.isVPNActive() || TorStatusObservable.getStatus() != OFF) {
+            result.putBoolean(BROADCAST_RESULT_KEY, false);
+            return result;
+        }
+
+        try {
+            URL geoIpUrl = provider.getGeoipUrl().getUrl();
+
+            String geoipJsonString = downloadFromUrlWithProviderCA(geoIpUrl.toString(), provider, false);
+            if (DEBUG_MODE) {
+                VpnStatus.logDebug("[API] MENSHEN JSON: " + geoipJsonString);
+            }
+            JSONObject geoipJson = new JSONObject(geoipJsonString);
+
+            if (geoipJson.has(ERRORS)) {
+                result.putBoolean(BROADCAST_RESULT_KEY, false);
+            } else{
+                provider.setGeoIpJson(geoipJson);
+                provider.setLastGeoIpUpdate(System.currentTimeMillis());
+                result.putBoolean(BROADCAST_RESULT_KEY, true);
+            }
+
+        } catch (JSONException | NullPointerException e) {
+            result.putBoolean(BROADCAST_RESULT_KEY, false);
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+
+    private Bundle downloadCACert(Provider provider) {
+        Bundle result = new Bundle();
+        try {
+            String caCertUrl = provider.getDefinition().getString(Provider.CA_CERT_URI);
+            String providerDomain = provider.getDomain();
+            String certString = downloadWithCommercialCA(caCertUrl, provider);
+
+            if (validCertificate(provider, certString)) {
+                provider.setCaCert(certString);
+                if (DEBUG_MODE) {
+                    VpnStatus.logDebug("[API] CA CERT: " + certString);
+                }
+                PreferenceHelper.putProviderString(providerDomain, Provider.CA_CERT, certString);
+                result.putBoolean(BROADCAST_RESULT_KEY, true);
+            } else {
+                eventSender.setErrorResult(result, warning_corrupted_provider_cert, ERROR_CERTIFICATE_PINNING.toString());
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
+    private String downloadWithCommercialCA(String stringUrl, Provider provider) {
+        return downloadWithCommercialCA(stringUrl, provider, true);
+    }
+
+        /**
+         * Tries to download the contents of the provided url using commercially validated CA certificate from chosen provider.
+         *
+         */
+    private String downloadWithCommercialCA(String stringUrl, Provider provider, boolean allowRetry) {
+
+        String responseString;
+        JSONObject errorJson = new JSONObject();
+
+        OkHttpClient okHttpClient = clientGenerator.initCommercialCAHttpClient(errorJson, getProxyPort());
+        if (okHttpClient == null) {
+            return errorJson.toString();
+        }
+
+        List<Pair<String, String>> headerArgs = getAuthorizationHeader();
+
+        responseString = sendGetStringToServer(stringUrl, headerArgs, okHttpClient);
+
+        if (responseString != null && responseString.contains(ERRORS)) {
+            try {
+                // try to download with provider CA on certificate error
+                JSONObject responseErrorJson = new JSONObject(responseString);
+                if (responseErrorJson.getString(ERRORS).equals(getProviderFormattedString(resources, R.string.certificate_error))) {
+                    responseString = downloadWithProviderCA(provider.getCaCert(), stringUrl);
+                }
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+
+        try {
+            if (allowRetry &&
+                    responseString != null &&
+                    responseString.contains(ERRORS)  &&
+                    TorStatusObservable.getStatus() == OFF &&
+                    torHandler.startTorProxy()
+            ) {
+                return downloadWithCommercialCA(stringUrl, provider, false);
+            }
+        } catch (InterruptedException | IllegalStateException | TimeoutException e) {
+            e.printStackTrace();
+        }
+        return responseString;
+    }
+
+
+    /**
+     * Tries to download the contents of the provided url using not commercially validated CA certificate from chosen provider.
+     *
+     * @return an empty string if it fails, the response body if not.
+     */
+    private String downloadFromApiUrlWithProviderCA(String path, Provider provider) {
+        String baseUrl = provider.getApiUrlString();
+        String urlString = baseUrl + path;
+        return downloadFromUrlWithProviderCA(urlString, provider);
+    }
+
+    /**
+     * Tries to download the contents of $base_url/$version/$path using not commercially validated CA certificate from chosen provider.
+     *
+     * @return an empty string if it fails, the response body if not.
+     */
+    private String downloadFromVersionedApiUrlWithProviderCA(String path, Provider provider) {
+        String baseUrl = provider.getApiUrlWithVersion();
+        String urlString = baseUrl + path;
+        return downloadFromUrlWithProviderCA(urlString, provider);
+    }
+
+    private String downloadFromUrlWithProviderCA(String urlString, Provider provider) {
+        return downloadFromUrlWithProviderCA(urlString, provider, true);
+    }
+
+    private String downloadFromUrlWithProviderCA(String urlString, Provider provider, boolean allowRetry) {
+        String responseString;
+        JSONObject errorJson = new JSONObject();
+        OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(provider.getCaCert(), getProxyPort(), errorJson);
+        if (okHttpClient == null) {
+            return errorJson.toString();
+        }
+
+        List<Pair<String, String>> headerArgs = getAuthorizationHeader();
+        responseString = sendGetStringToServer(urlString, headerArgs, okHttpClient);
+
+        try {
+            if (allowRetry &&
+                    responseString != null &&
+                    responseString.contains(ERRORS)  &&
+                    TorStatusObservable.getStatus() == OFF &&
+                    torHandler.startTorProxy()
+            ) {
+                return downloadFromUrlWithProviderCA(urlString, provider, false);
+            }
+        } catch (InterruptedException | IllegalStateException | TimeoutException e) {
+            e.printStackTrace();
+        }
+
+        return responseString;
+    }
+
+
+        /**
+         * Tries to download the contents of the provided url using not commercially validated CA certificate from chosen provider.
+         *
+         * @param urlString as a string
+         * @return an empty string if it fails, the url content if not.
+         */
+    private String downloadWithProviderCA(String caCert, String urlString) {
+        JSONObject initError = new JSONObject();
+        String responseString;
+
+        OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(caCert, getProxyPort(), initError);
+        if (okHttpClient == null) {
+            return initError.toString();
+        }
+
+        List<Pair<String, String>> headerArgs = getAuthorizationHeader();
+
+        responseString = sendGetStringToServer(urlString, headerArgs, okHttpClient);
+
+        return responseString;
+    }
+
+    protected String sendGetStringToServer(@NonNull String url, @NonNull List<Pair<String, String>> headerArgs, @NonNull OkHttpClient okHttpClient) {
+        return requestStringFromServer(url, "GET", null, headerArgs, okHttpClient);
+    }
+
+    private String requestStringFromServer(@NonNull String url, @NonNull String requestMethod, String jsonString, @NonNull List<Pair<String, String>> headerArgs, @NonNull OkHttpClient okHttpClient) {
+        String plainResponseBody;
+
+        try {
+
+            plainResponseBody = ProviderApiConnector.requestStringFromServer(url, requestMethod, jsonString, headerArgs, okHttpClient);
+
+        } catch (NullPointerException npe) {
+            plainResponseBody = eventSender.formatErrorMessage(error_json_exception_user_message);
+            VpnStatus.logWarning("[API] Null response body for request " + url + ": " + npe.getLocalizedMessage());
+        } catch (UnknownHostException | SocketTimeoutException e) {
+            plainResponseBody = eventSender.formatErrorMessage(server_unreachable_message);
+            VpnStatus.logWarning("[API] UnknownHostException or SocketTimeoutException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (MalformedURLException e) {
+            plainResponseBody = eventSender.formatErrorMessage(malformed_url);
+            VpnStatus.logWarning("[API] MalformedURLException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (SSLHandshakeException | SSLPeerUnverifiedException e) {
+            plainResponseBody = eventSender.formatErrorMessage(certificate_error);
+            VpnStatus.logWarning("[API] SSLHandshakeException or SSLPeerUnverifiedException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (ConnectException e) {
+            plainResponseBody = eventSender.formatErrorMessage(service_is_down_error);
+            VpnStatus.logWarning("[API] ConnectException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (IllegalArgumentException e) {
+            plainResponseBody = eventSender.formatErrorMessage(error_no_such_algorithm_exception_user_message);
+            VpnStatus.logWarning("[API] IllegalArgumentException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (UnknownServiceException e) {
+            //unable to find acceptable protocols - tlsv1.2 not enabled?
+            plainResponseBody = eventSender.formatErrorMessage(error_no_such_algorithm_exception_user_message);
+            VpnStatus.logWarning("[API] UnknownServiceException for request " + url + ": " + e.getLocalizedMessage());
+        } catch (IOException e) {
+            plainResponseBody = eventSender.formatErrorMessage(error_io_exception_user_message);
+            VpnStatus.logWarning("[API] IOException for request " + url + ": " + e.getLocalizedMessage());
+        }
+
+        return plainResponseBody;
+    }
+
+    private boolean canConnect(Provider provider, Bundle result) {
+        return canConnect(provider, result, 0);
+    }
+
+    private boolean canConnect(Provider provider, Bundle result, int tries) {
+        JSONObject errorJson = new JSONObject();
+        String providerUrl = provider.getApiUrlString() + "/provider.json";
+
+        OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(provider.getCaCert(), getProxyPort(), errorJson);
+        if (okHttpClient == null) {
+            result.putString(ERRORS, errorJson.toString());
+            return false;
+        }
+
+        if (tries > 0) {
+            result.remove(ERRORS);
+        }
+
+        try {
+            return ProviderApiConnector.canConnect(okHttpClient, providerUrl);
+
+        }  catch (UnknownHostException | SocketTimeoutException e) {
+            VpnStatus.logWarning("[API] UnknownHostException or SocketTimeoutException during connection check: " + e.getLocalizedMessage());
+            eventSender.setErrorResult(result, server_unreachable_message, null);
+        } catch (MalformedURLException e) {
+            VpnStatus.logWarning("[API] MalformedURLException during connection check: " + e.getLocalizedMessage());
+            eventSender.setErrorResult(result, malformed_url, null);
+        } catch (SSLHandshakeException e) {
+            VpnStatus.logWarning("[API] SSLHandshakeException during connection check: " + e.getLocalizedMessage());
+            eventSender.setErrorResult(result, warning_corrupted_provider_cert, ERROR_INVALID_CERTIFICATE.toString());
+        } catch (ConnectException e) {
+            VpnStatus.logWarning("[API] ConnectException during connection check: " + e.getLocalizedMessage());
+            eventSender.setErrorResult(result, service_is_down_error, null);
+        } catch (IllegalArgumentException e) {
+            VpnStatus.logWarning("[API] IllegalArgumentException during connection check: " + e.getLocalizedMessage());
+            eventSender.setErrorResult(result, error_no_such_algorithm_exception_user_message, null);
+        } catch (UnknownServiceException e) {
+            VpnStatus.logWarning("[API] UnknownServiceException during connection check: " + e.getLocalizedMessage());
+            //unable to find acceptable protocols - tlsv1.2 not enabled?
+            eventSender.setErrorResult(result, error_no_such_algorithm_exception_user_message, null);
+        } catch (IOException e) {
+            VpnStatus.logWarning("[API] IOException during connection check: " + e.getLocalizedMessage());
+            eventSender.setErrorResult(result, error_io_exception_user_message, null);
+        }
+
+        try {
+            if (tries == 0 &&
+                    result.containsKey(ERRORS) &&
+                    TorStatusObservable.getStatus() == OFF &&
+                    torHandler.startTorProxy()
+            ) {
+                return canConnect(provider, result, 1);
+            }
+        } catch (InterruptedException | IllegalStateException | TimeoutException e) {
+            e.printStackTrace();
+        }
+
+        return false;
+    }
+
+    Bundle validateProviderDetails(Provider provider) {
+        Bundle result = new Bundle();
+        result.putBoolean(BROADCAST_RESULT_KEY, false);
+
+        if (!provider.hasDefinition()) {
+            return result;
+        }
+
+        result = validateCertificateForProvider(result, provider);
+
+        //invalid certificate or no certificate or unable to connect due other connectivity issues
+        if (result.containsKey(ERRORS) || (result.containsKey(BROADCAST_RESULT_KEY) && !result.getBoolean(BROADCAST_RESULT_KEY)) ) {
+            return result;
+        }
+
+        result.putBoolean(BROADCAST_RESULT_KEY, true);
+
+        return result;
+    }
+
+    protected Bundle validateCertificateForProvider(Bundle result, Provider provider) {
+        String caCert = provider.getCaCert();
+
+        if (ConfigHelper.checkErroneousDownload(caCert)) {
+            VpnStatus.logWarning("[API] No provider cert.");
+            return result;
+        }
+
+        ArrayList<X509Certificate> certificates = ConfigHelper.parseX509CertificatesFromString(caCert);
+        if (certificates == null) {
+            return eventSender.setErrorResult(result, warning_corrupted_provider_cert, ERROR_INVALID_CERTIFICATE.toString());
+        }
+        try {
+            String encoding = provider.getCertificatePinEncoding();
+            String expectedFingerprint = provider.getCertificatePin();
+
+            // Do certificate pinning only if we have 1 cert, otherwise we assume some transitioning of
+            // X509 certs, therefore we cannot do cert pinning
+            if (certificates.size() == 1) {
+                String realFingerprint = getFingerprintFromCertificate(certificates.get(0), encoding);
+                if (!realFingerprint.trim().equalsIgnoreCase(expectedFingerprint.trim())) {
+                    return eventSender.setErrorResult(result, warning_corrupted_provider_cert, ERROR_CERTIFICATE_PINNING.toString());
+                }
+            }
+            for (X509Certificate certificate : certificates) {
+                certificate.checkValidity();
+            }
+
+            if (!canConnect(provider, result)) {
+                return result;
+            }
+        } catch (NoSuchAlgorithmException e ) {
+            return eventSender.setErrorResult(result, error_no_such_algorithm_exception_user_message, null);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            return eventSender.setErrorResult(result, warning_corrupted_provider_details, ERROR_CORRUPTED_PROVIDER_JSON.toString());
+        } catch (CertificateEncodingException | CertificateNotYetValidException |
+                 CertificateExpiredException e) {
+            return eventSender.setErrorResult(result, warning_expired_provider_cert, ERROR_INVALID_CERTIFICATE.toString());
+        }
+
+        result.putBoolean(BROADCAST_RESULT_KEY, true);
+        return result;
+    }
+
+    @NonNull
+    protected List<Pair<String, String>> getAuthorizationHeader() {
+        List<Pair<String, String>> headerArgs = new ArrayList<>();
+        if (!LeapSRPSession.getToken().isEmpty()) {
+            Pair<String, String> authorizationHeaderPair = new Pair<>(LeapSRPSession.AUTHORIZATION_HEADER, "Token token=" + LeapSRPSession.getToken());
+            headerArgs.add(authorizationHeaderPair);
+        }
+        return headerArgs;
+    }
+
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java
new file mode 100644
index 00000000..4e698d28
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java
@@ -0,0 +1,76 @@
+package se.leap.bitmaskclient.providersetup;
+
+import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_KEY;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_DOWNLOADED_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.PROVIDER_NOK;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.PROVIDER_OK;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.QUIETLY_UPDATE_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.SET_UP_PROVIDER;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_VPN_CERTIFICATE;
+
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.ResultReceiver;
+import android.util.Log;
+
+import se.leap.bitmaskclient.base.models.Provider;
+import se.leap.bitmaskclient.base.models.ProviderObservable;
+import se.leap.bitmaskclient.base.utils.PreferenceHelper;
+
+public class ProviderApiManagerV5 extends ProviderApiManagerBase implements IProviderApiManager {
+
+    private static final String TAG = ProviderApiManagerV5.class.getSimpleName();
+
+    ProviderApiManagerV5(Resources resources, ProviderApiServiceCallback callback) {
+        super(resources, callback);
+    }
+
+    @Override
+    public void handleAction(String action, Provider provider, Bundle parameters, ResultReceiver receiver) {
+        Bundle result = new Bundle();
+        switch (action) {
+            case SET_UP_PROVIDER:
+                result = setupProvider(provider, parameters);
+                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                    eventSender.sendToReceiverOrBroadcast(receiver, PROVIDER_OK, result, provider);
+                } else {
+                    eventSender.sendToReceiverOrBroadcast(receiver, PROVIDER_NOK, result, provider);
+                }
+                break;
+            case DOWNLOAD_VPN_CERTIFICATE:
+                result = updateVpnCertificate(provider);
+                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                    serviceCallback.saveProvider(provider);
+                    ProviderSetupObservable.updateProgress(DOWNLOADED_VPN_CERTIFICATE);
+                    eventSender.sendToReceiverOrBroadcast(receiver, CORRECTLY_DOWNLOADED_VPN_CERTIFICATE, result, provider);
+                } else {
+                    eventSender.sendToReceiverOrBroadcast(receiver, INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE, result, provider);
+                }
+                break;
+            case QUIETLY_UPDATE_VPN_CERTIFICATE:
+            case UPDATE_INVALID_VPN_CERTIFICATE:
+                result = updateVpnCertificate(provider);
+                if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                    Log.d(TAG, "successfully downloaded VPN certificate");
+                    provider.setShouldUpdateVpnCertificate(false);
+                    PreferenceHelper.storeProviderInPreferences(provider);
+                    ProviderObservable.getInstance().updateProvider(provider);
+                }
+                break;
+        }
+
+    }
+
+    protected Bundle setupProvider(Provider provider, Bundle task) {
+        return null;
+    }
+
+
+    protected Bundle updateVpnCertificate(Provider provider) {
+        return null;
+    }
+
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiTorHandler.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiTorHandler.java
new file mode 100644
index 00000000..b551cea0
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiTorHandler.java
@@ -0,0 +1,52 @@
+package se.leap.bitmaskclient.providersetup;
+
+import static se.leap.bitmaskclient.base.utils.ConfigHelper.getTorTimeout;
+import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.ON;
+
+import org.jetbrains.annotations.Blocking;
+
+import java.util.concurrent.TimeoutException;
+
+import se.leap.bitmaskclient.base.utils.PreferenceHelper;
+import se.leap.bitmaskclient.eip.EipStatus;
+import se.leap.bitmaskclient.tor.TorStatusObservable;
+
+public class ProviderApiTorHandler {
+
+    ProviderApiManagerBase.ProviderApiServiceCallback serviceCallback;
+    public ProviderApiTorHandler(ProviderApiManagerBase.ProviderApiServiceCallback callback) {
+        this.serviceCallback = callback;
+    }
+
+    @Blocking
+    public boolean startTorProxy() throws InterruptedException, IllegalStateException, TimeoutException {
+        if (EipStatus.getInstance().isDisconnected() &&
+                PreferenceHelper.getUseSnowflake() &&
+                serviceCallback.startTorService()) {
+            waitForTorCircuits();
+            if (TorStatusObservable.isCancelled()) {
+                throw new InterruptedException("Cancelled Tor setup.");
+            }
+            int port = serviceCallback.getTorHttpTunnelPort();
+            TorStatusObservable.setProxyPort(port);
+            return port != -1;
+        }
+        return false;
+    }
+
+    public void stopTorProxy() {
+        serviceCallback.stopTorService();
+    }
+
+    private void waitForTorCircuits() throws InterruptedException, TimeoutException {
+        if (TorStatusObservable.getStatus() == ON) {
+            return;
+        }
+        TorStatusObservable.waitUntil(this::isTorOnOrCancelled, getTorTimeout());
+    }
+
+    private boolean isTorOnOrCancelled() {
+        return TorStatusObservable.getStatus() == ON || TorStatusObservable.isCancelled();
+    }
+
+}
diff --git a/app/src/production/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java b/app/src/production/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java
deleted file mode 100644
index 1f4e7e49..00000000
--- a/app/src/production/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/**
- * Copyright (c) 2018 LEAP Encryption Access Project and contributers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package se.leap.bitmaskclient.providersetup;
-
-import static android.text.TextUtils.isEmpty;
-import static se.leap.bitmaskclient.BuildConfig.DEBUG_MODE;
-import static se.leap.bitmaskclient.R.string.downloading_vpn_certificate_failed;
-import static se.leap.bitmaskclient.R.string.error_io_exception_user_message;
-import static se.leap.bitmaskclient.R.string.malformed_url;
-import static se.leap.bitmaskclient.R.string.setup_error_text;
-import static se.leap.bitmaskclient.R.string.setup_error_text_custom;
-import static se.leap.bitmaskclient.R.string.warning_corrupted_provider_cert;
-import static se.leap.bitmaskclient.R.string.warning_corrupted_provider_details;
-import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_KEY;
-import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_KEY;
-import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.base.utils.ConfigHelper.getProviderFormattedString;
-import static se.leap.bitmaskclient.base.utils.BuildConfigHelper.isDefaultBitmask;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.ERRORS;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_CERTIFICATE_PINNING;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupFailedDialog.DOWNLOAD_ERRORS.ERROR_CORRUPTED_PROVIDER_JSON;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_CA_CERT;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_EIP_SERVICE_JSON;
-import static se.leap.bitmaskclient.providersetup.ProviderSetupObservable.DOWNLOADED_PROVIDER_JSON;
-import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.OFF;
-import static se.leap.bitmaskclient.tor.TorStatusObservable.getProxyPort;
-
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.util.Pair;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.net.URL;
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-
-import de.blinkt.openvpn.core.VpnStatus;
-import okhttp3.OkHttpClient;
-import se.leap.bitmaskclient.R;
-import se.leap.bitmaskclient.base.models.Provider;
-import se.leap.bitmaskclient.base.utils.ConfigHelper;
-import se.leap.bitmaskclient.base.utils.PreferenceHelper;
-import se.leap.bitmaskclient.eip.EIP;
-import se.leap.bitmaskclient.providersetup.connectivity.OkHttpClientGenerator;
-import se.leap.bitmaskclient.tor.TorStatusObservable;
-
-/**
- * Implements the logic of the provider api http requests. The methods of this class need to be called from
- * a background thread.
- */
-
-
-public class ProviderApiManager extends ProviderApiManagerBase {
-
-    private static final String TAG = ProviderApiManager.class.getSimpleName();
-
-    public ProviderApiManager(Resources resources, OkHttpClientGenerator clientGenerator, ProviderApiServiceCallback callback) {
-        super(resources, clientGenerator, callback);
-    }
-
-    /**
-     * Only used in insecure flavor.
-     */
-    public static boolean lastDangerOn() {
-        return false;
-    }
-
-    /**
-     * Downloads a provider.json from a given URL, adding a new provider using the given name.
-     *
-     * @param task containing a boolean meaning if the provider is custom or not, another boolean meaning if the user completely trusts this provider, the provider name and its provider.json url.
-     * @return a bundle with a boolean value mapped to a key named BROADCAST_RESULT_KEY, and which is true if the update was successful.
-     */
-    @Override
-    protected Bundle setUpProvider(Provider provider, Bundle task) {
-        Bundle currentDownload = new Bundle();
-
-        if (isEmpty(provider.getMainUrlString()) || provider.getMainUrl().isDefault()) {
-            currentDownload.putBoolean(BROADCAST_RESULT_KEY, false);
-            setErrorResult(currentDownload, malformed_url, null);
-            VpnStatus.logWarning("[API] MainURL String is not set. Cannot setup provider.");
-            return currentDownload;
-        }
-
-        getPersistedProviderUpdates(provider);
-        currentDownload = validateProviderDetails(provider);
-
-        //provider certificate invalid
-        if (currentDownload.containsKey(ERRORS)) {
-            currentDownload.putParcelable(PROVIDER_KEY, provider);
-            return currentDownload;
-        }
-
-        //no provider json or certificate available
-        if (currentDownload.containsKey(BROADCAST_RESULT_KEY) && !currentDownload.getBoolean(BROADCAST_RESULT_KEY)) {
-            resetProviderDetails(provider);
-        }
-
-        currentDownload = getAndSetProviderJson(provider);
-        if (provider.hasDefinition() || (currentDownload.containsKey(BROADCAST_RESULT_KEY) && currentDownload.getBoolean(BROADCAST_RESULT_KEY))) {
-            ProviderSetupObservable.updateProgress(DOWNLOADED_PROVIDER_JSON);
-            if (!provider.hasCaCert()) {
-                currentDownload = downloadCACert(provider);
-            }
-            if (provider.hasCaCert() || (currentDownload.containsKey(BROADCAST_RESULT_KEY) && currentDownload.getBoolean(BROADCAST_RESULT_KEY))) {
-                ProviderSetupObservable.updateProgress(DOWNLOADED_CA_CERT);
-                currentDownload = getAndSetEipServiceJson(provider);
-            }
-
-            if (provider.hasEIP() && !provider.allowsRegistered() && !provider.allowsAnonymous()) {
-                setErrorResult(currentDownload, isDefaultBitmask() ? setup_error_text : setup_error_text_custom, null);
-            } else if (provider.hasEIP()) {
-                ProviderSetupObservable.updateProgress(DOWNLOADED_EIP_SERVICE_JSON);
-            }
-        }
-
-        return currentDownload;
-    }
-
-
-    private Bundle getAndSetProviderJson(Provider provider) {
-        Bundle result = new Bundle();
-
-        String providerDotJsonString;
-        if(provider.getDefinitionString().length() == 0 || provider.getCaCert().isEmpty()) {
-            String providerJsonUrl = provider.getMainUrlString() + "/provider.json";
-            providerDotJsonString = downloadWithCommercialCA(providerJsonUrl, provider);
-        } else {
-            providerDotJsonString = downloadFromApiUrlWithProviderCA("/provider.json", provider);
-        }
-
-        if (ConfigHelper.checkErroneousDownload(providerDotJsonString) || !isValidJson(providerDotJsonString)) {
-            setErrorResult(result, malformed_url, null);
-            return result;
-        }
-
-        if (DEBUG_MODE) {
-            VpnStatus.logDebug("[API] PROVIDER JSON: " + providerDotJsonString);
-        }
-        try {
-            JSONObject providerJson = new JSONObject(providerDotJsonString);
-
-            if (provider.define(providerJson)) {
-                result.putBoolean(BROADCAST_RESULT_KEY, true);
-            } else {
-                return setErrorResult(result, warning_corrupted_provider_details, ERROR_CORRUPTED_PROVIDER_JSON.toString());
-            }
-
-        } catch (JSONException e) {
-            setErrorResult(result, providerDotJsonString);
-        }
-        return result;
-    }
-
-    /**
-     * Downloads the eip-service.json from a given URL, and saves eip service capabilities including the offered gateways
-     * @return a bundle with a boolean value mapped to a key named BROADCAST_RESULT_KEY, and which is true if the download was successful.
-     */
-    @Override
-    protected Bundle getAndSetEipServiceJson(Provider provider) {
-        Bundle result = new Bundle();
-        String eipServiceJsonString = "";
-        try {
-            String eipServiceUrl = provider.getApiUrlWithVersion() + "/" + EIP.SERVICE_API_PATH;
-            eipServiceJsonString = downloadWithProviderCA(provider.getCaCert(), eipServiceUrl);
-            if (DEBUG_MODE) {
-                VpnStatus.logDebug("[API] EIP SERVICE JSON: " + eipServiceJsonString);
-            }
-            JSONObject eipServiceJson = new JSONObject(eipServiceJsonString);
-            if (eipServiceJson.has(ERRORS)) {
-                setErrorResult(result, eipServiceJsonString);
-            } else {
-                provider.setEipServiceJson(eipServiceJson);
-                provider.setLastEipServiceUpdate(System.currentTimeMillis());
-                result.putBoolean(BROADCAST_RESULT_KEY, true);
-            }
-        } catch (NullPointerException | JSONException e) {
-            setErrorResult(result, R.string.error_json_exception_user_message, null);
-        }
-        return result;
-    }
-
-    /**
-     * Downloads a new OpenVPN certificate, attaching authenticated cookie for authenticated certificate.
-     *
-     * @return true if certificate was downloaded correctly, false if provider.json is not present in SharedPreferences, or if the certificate url could not be parsed as a URI, or if there was an SSL error.
-     */
-    @Override
-    protected Bundle updateVpnCertificate(Provider provider) {
-        Bundle result = new Bundle();
-        String certString = downloadFromVersionedApiUrlWithProviderCA("/" + PROVIDER_VPN_CERTIFICATE, provider);
-        if (DEBUG_MODE) {
-            VpnStatus.logDebug("[API] VPN CERT: " + certString);
-        }
-        if (ConfigHelper.checkErroneousDownload(certString)) {
-            if (TorStatusObservable.isRunning()) {
-                setErrorResult(result, downloading_vpn_certificate_failed, null);
-            } else if (certString == null || certString.isEmpty() ){
-                // probably 204
-                setErrorResult(result, error_io_exception_user_message, null);
-            } else {
-                setErrorResult(result, certString);
-            }
-            return result;
-        }
-        return loadCertificate(provider, certString);
-    }
-
-    /**
-     * Fetches the geo ip Json, containing a list of gateways sorted by distance from the users current location.
-     * Fetching is only allowed if the cache timeout of 1 h was reached, a valid geoip service URL exists and the
-     * vpn or tor is not running. The latter condition is needed in order to guarantee that the geoip service sees
-     * the real ip of the client
-     *
-     * @param provider
-     * @return
-     */
-    @Override
-    protected Bundle getGeoIPJson(Provider provider) {
-        Bundle result = new Bundle();
-
-        if (!provider.shouldUpdateGeoIpJson() || provider.getGeoipUrl().isDefault() || VpnStatus.isVPNActive() || TorStatusObservable.getStatus() != OFF) {
-            result.putBoolean(BROADCAST_RESULT_KEY, false);
-            return result;
-        }
-
-        try {
-            URL geoIpUrl = provider.getGeoipUrl().getUrl();
-
-            String geoipJsonString = downloadFromUrlWithProviderCA(geoIpUrl.toString(), provider, false);
-            if (DEBUG_MODE) {
-                VpnStatus.logDebug("[API] MENSHEN JSON: " + geoipJsonString);
-            }
-            JSONObject geoipJson = new JSONObject(geoipJsonString);
-
-            if (geoipJson.has(ERRORS)) {
-                result.putBoolean(BROADCAST_RESULT_KEY, false);
-            } else{
-                provider.setGeoIpJson(geoipJson);
-                provider.setLastGeoIpUpdate(System.currentTimeMillis());
-                result.putBoolean(BROADCAST_RESULT_KEY, true);
-            }
-
-        } catch (JSONException | NullPointerException e) {
-            result.putBoolean(BROADCAST_RESULT_KEY, false);
-            e.printStackTrace();
-        }
-        return result;
-    }
-
-
-    private Bundle downloadCACert(Provider provider) {
-        Bundle result = new Bundle();
-        try {
-            String caCertUrl = provider.getDefinition().getString(Provider.CA_CERT_URI);
-            String providerDomain = provider.getDomain();
-            String certString = downloadWithCommercialCA(caCertUrl, provider);
-
-            if (validCertificate(provider, certString)) {
-                provider.setCaCert(certString);
-                if (DEBUG_MODE) {
-                    VpnStatus.logDebug("[API] CA CERT: " + certString);
-                }
-                PreferenceHelper.putProviderString(providerDomain, Provider.CA_CERT, certString);
-                result.putBoolean(BROADCAST_RESULT_KEY, true);
-            } else {
-                setErrorResult(result, warning_corrupted_provider_cert, ERROR_CERTIFICATE_PINNING.toString());
-            }
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        return result;
-    }
-
-    private String downloadWithCommercialCA(String stringUrl, Provider provider) {
-        return downloadWithCommercialCA(stringUrl, provider, true);
-    }
-
-        /**
-         * Tries to download the contents of the provided url using commercially validated CA certificate from chosen provider.
-         *
-         */
-    private String downloadWithCommercialCA(String stringUrl, Provider provider, boolean allowRetry) {
-
-        String responseString;
-        JSONObject errorJson = new JSONObject();
-
-        OkHttpClient okHttpClient = clientGenerator.initCommercialCAHttpClient(errorJson, getProxyPort());
-        if (okHttpClient == null) {
-            return errorJson.toString();
-        }
-
-        List<Pair<String, String>> headerArgs = getAuthorizationHeader();
-
-        responseString = sendGetStringToServer(stringUrl, headerArgs, okHttpClient);
-
-        if (responseString != null && responseString.contains(ERRORS)) {
-            try {
-                // try to download with provider CA on certificate error
-                JSONObject responseErrorJson = new JSONObject(responseString);
-                if (responseErrorJson.getString(ERRORS).equals(getProviderFormattedString(resources, R.string.certificate_error))) {
-                    responseString = downloadWithProviderCA(provider.getCaCert(), stringUrl);
-                }
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        }
-
-        try {
-            if (allowRetry &&
-                    responseString != null &&
-                    responseString.contains(ERRORS)  &&
-                    TorStatusObservable.getStatus() == OFF &&
-                    startTorProxy()
-            ) {
-                return downloadWithCommercialCA(stringUrl, provider, false);
-            }
-        } catch (InterruptedException | IllegalStateException | TimeoutException e) {
-            e.printStackTrace();
-        }
-        return responseString;
-    }
-
-
-    /**
-     * Tries to download the contents of the provided url using not commercially validated CA certificate from chosen provider.
-     *
-     * @return an empty string if it fails, the response body if not.
-     */
-    private String downloadFromApiUrlWithProviderCA(String path, Provider provider) {
-        String baseUrl = provider.getApiUrlString();
-        String urlString = baseUrl + path;
-        return downloadFromUrlWithProviderCA(urlString, provider);
-    }
-
-    /**
-     * Tries to download the contents of $base_url/$version/$path using not commercially validated CA certificate from chosen provider.
-     *
-     * @return an empty string if it fails, the response body if not.
-     */
-    private String downloadFromVersionedApiUrlWithProviderCA(String path, Provider provider) {
-        String baseUrl = provider.getApiUrlWithVersion();
-        String urlString = baseUrl + path;
-        return downloadFromUrlWithProviderCA(urlString, provider);
-    }
-
-    private String downloadFromUrlWithProviderCA(String urlString, Provider provider) {
-        return downloadFromUrlWithProviderCA(urlString, provider, true);
-    }
-
-    private String downloadFromUrlWithProviderCA(String urlString, Provider provider, boolean allowRetry) {
-        String responseString;
-        JSONObject errorJson = new JSONObject();
-        OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(provider.getCaCert(), getProxyPort(), errorJson);
-        if (okHttpClient == null) {
-            return errorJson.toString();
-        }
-
-        List<Pair<String, String>> headerArgs = getAuthorizationHeader();
-        responseString = sendGetStringToServer(urlString, headerArgs, okHttpClient);
-
-        try {
-            if (allowRetry &&
-                    responseString != null &&
-                    responseString.contains(ERRORS)  &&
-                    TorStatusObservable.getStatus() == OFF &&
-                    startTorProxy()
-            ) {
-                return downloadFromUrlWithProviderCA(urlString, provider, false);
-            }
-        } catch (InterruptedException | IllegalStateException | TimeoutException e) {
-            e.printStackTrace();
-        }
-
-        return responseString;
-    }
-
-
-        /**
-         * Tries to download the contents of the provided url using not commercially validated CA certificate from chosen provider.
-         *
-         * @param urlString as a string
-         * @return an empty string if it fails, the url content if not.
-         */
-    private String downloadWithProviderCA(String caCert, String urlString) {
-        JSONObject initError = new JSONObject();
-        String responseString;
-
-        OkHttpClient okHttpClient = clientGenerator.initSelfSignedCAHttpClient(caCert, getProxyPort(), initError);
-        if (okHttpClient == null) {
-            return initError.toString();
-        }
-
-        List<Pair<String, String>> headerArgs = getAuthorizationHeader();
-
-        responseString = sendGetStringToServer(urlString, headerArgs, okHttpClient);
-
-        return responseString;
-    }
-}
diff --git a/app/src/test/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerTest.java b/app/src/test/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerTest.java
new file mode 100644
index 00000000..711d5487
--- /dev/null
+++ b/app/src/test/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerTest.java
@@ -0,0 +1,265 @@
+package se.leap.bitmaskclient.providersetup;
+
+import static org.junit.Assert.*;
+
+import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_KEY;
+import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_KEY;
+import static se.leap.bitmaskclient.base.models.Constants.USE_BRIDGES;
+import static se.leap.bitmaskclient.base.models.Constants.USE_SNOWFLAKE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.ERRORS;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.MISSING_NETWORK_CONNECTION;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.PARAMETERS;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.PROVIDER_OK;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.TOR_EXCEPTION;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.TOR_TIMEOUT;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.testutils.BackendMockResponses.BackendMockProvider.TestBackendErrorCase.NO_ERROR;
+import static se.leap.bitmaskclient.testutils.BackendMockResponses.BackendMockProvider.TestBackendErrorCase.NO_ERROR_API_V4;
+import static se.leap.bitmaskclient.testutils.MockHelper.mockBuildConfigHelper;
+import static se.leap.bitmaskclient.testutils.MockHelper.mockCertificateHelper;
+import static se.leap.bitmaskclient.testutils.MockHelper.mockClientGenerator;
+import static se.leap.bitmaskclient.testutils.MockHelper.mockContext;
+import static se.leap.bitmaskclient.testutils.MockHelper.mockPreferenceHelper;
+import static se.leap.bitmaskclient.testutils.MockHelper.mockProviderApiConnector;
+import static se.leap.bitmaskclient.testutils.MockHelper.mockRSAHelper;
+import static se.leap.bitmaskclient.testutils.MockHelper.mockResources;
+import static se.leap.bitmaskclient.testutils.MockHelper.mockResultReceiver;
+import static se.leap.bitmaskclient.testutils.TestSetupHelper.getConfiguredProvider;
+import static se.leap.bitmaskclient.testutils.TestSetupHelper.getConfiguredProviderAPIv4;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import org.json.JSONException;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
+import java.util.concurrent.TimeoutException;
+
+import se.leap.bitmaskclient.base.models.Provider;
+import se.leap.bitmaskclient.base.utils.BuildConfigHelper;
+import se.leap.bitmaskclient.base.utils.CertificateHelper;
+import se.leap.bitmaskclient.base.utils.HandlerProvider;
+import se.leap.bitmaskclient.base.utils.PreferenceHelper;
+import se.leap.bitmaskclient.base.utils.RSAHelper;
+import se.leap.bitmaskclient.testutils.MockSharedPreferences;
+import se.leap.bitmaskclient.tor.TorStatusObservable;
+
+public class ProviderApiManagerTest {
+
+    private Resources mockResources;
+    private Context mockContext;
+
+    private ProviderApiManager providerApiManager;
+
+    static class TestProviderApiServiceCallback implements ProviderApiManagerBase.ProviderApiServiceCallback {
+        Throwable startTorServiceException;
+        boolean hasNetworkConnection;
+        boolean torTimeout;
+        TorStatusObservable torStatusObservable;
+
+        TestProviderApiServiceCallback() {
+            this(null, true);
+        }
+        TestProviderApiServiceCallback(@Nullable Throwable startTorServiceException, boolean hasNetworkConnection) {
+            this.startTorServiceException = startTorServiceException;
+            this.hasNetworkConnection = hasNetworkConnection;
+            this.torStatusObservable = TorStatusObservable.getInstance();
+        }
+
+        TestProviderApiServiceCallback(boolean torTimeout, boolean hasNetworkConnection) {
+            this.hasNetworkConnection = hasNetworkConnection;
+            this.torStatusObservable = TorStatusObservable.getInstance();
+            this.torTimeout = torTimeout;
+        }
+
+        @Override
+        public void broadcastEvent(Intent intent) {
+        }
+
+        @Override
+        public boolean startTorService() throws InterruptedException, IllegalStateException {
+            if (startTorServiceException != null) {
+                if (startTorServiceException instanceof InterruptedException) {
+                    throw (InterruptedException) startTorServiceException;
+                }
+                if (startTorServiceException instanceof IllegalStateException) {
+                    throw (IllegalStateException) startTorServiceException;
+                }
+            }
+            if (!torTimeout) {
+                try {
+                    TorStatusObservable.updateState(mockContext(), TorStatusObservable.TorStatus.ON.toString());
+                } catch (PackageManager.NameNotFoundException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            return true;
+        }
+
+        @Override
+        public void stopTorService() {
+        }
+
+        @Override
+        public int getTorHttpTunnelPort() {
+            return 8118;
+        }
+
+        @Override
+        public boolean hasNetworkConnection() {
+            return hasNetworkConnection;
+        }
+
+        @Override
+        public void saveProvider(Provider p) {
+
+        }
+
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        mockContext = mockContext();
+        mockResources = mockResources(getClass().getClassLoader().getResourceAsStream("error_messages.json"));
+
+        HandlerProvider handlerProvider = new HandlerProvider((r, delay) -> new Thread(r).start());
+        BuildConfigHelper buildConfigHelper = mockBuildConfigHelper(true);
+        TorStatusObservable torStatusObservable = TorStatusObservable.getInstance();
+        TorStatusObservable.setProxyPort(-1);
+        TorStatusObservable.setLastError(null);
+        TorStatusObservable.updateState(mockContext, TorStatusObservable.TorStatus.OFF.toString());
+    }
+
+    @Test
+    public void test_handleIntentSetupProvider_TorBridgesPreferencesEnabledTimeout_TimeoutError() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException {
+        Provider provider = getConfiguredProviderAPIv4();
+        SharedPreferences sharedPreferences = new MockSharedPreferences();
+        sharedPreferences.edit().putBoolean(USE_BRIDGES, true).putBoolean(USE_SNOWFLAKE, true).commit();
+        PreferenceHelper preferenceHelper = mockPreferenceHelper(provider, sharedPreferences);
+        ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR_API_V4);
+
+        providerApiManager = new ProviderApiManager(mockResources, new ProviderApiManagerTest.TestProviderApiServiceCallback(true, true));
+
+        Bundle expectedResult = new Bundle();
+        expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
+        expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_TOR_TIMEOUT\",\"initalAction\":\"setUpProvider\",\"errors\":\"Starting bridges failed. Do you want to retry or continue with an unobfuscated secure connection to configure Bitmask?\"}");
+        expectedResult.putParcelable(PROVIDER_KEY, provider);
+
+        Intent providerApiCommand = new Intent();
+        providerApiCommand.putExtra(PROVIDER_KEY, provider);
+        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
+        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(TOR_TIMEOUT, expectedResult));
+        providerApiCommand.putExtra(PARAMETERS, new Bundle());
+
+        providerApiManager.handleIntent(providerApiCommand);
+        //providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(TOR_TIMEOUT, expectedResult));
+        assertEquals(-1, TorStatusObservable.getProxyPort());
+    }
+
+    @Test
+    public void test_handleIntentSetupProvider_noNetwork_NetworkError() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, JSONException {
+        Provider provider = getConfiguredProvider();
+
+        CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
+        ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
+        providerApiManager = new ProviderApiManager(mockResources, new ProviderApiManagerTest.TestProviderApiServiceCallback(null, false));
+        Bundle expectedResult = new Bundle();
+
+        expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
+        expectedResult.putString(ERRORS, "{\"errors\":\"Bitmask has no internet connection. Please check your WiFi and cellular data settings.\"}");
+        expectedResult.putParcelable(PROVIDER_KEY, provider);
+
+        Intent providerApiCommand = new Intent();
+
+        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
+        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(MISSING_NETWORK_CONNECTION, expectedResult));
+        providerApiCommand.putExtra(PROVIDER_KEY, provider);
+        providerApiCommand.putExtra(PARAMETERS, new Bundle());
+        providerApiManager.handleIntent(providerApiCommand);
+    }
+
+
+    @Test
+    public void test_handleIntentSetupProvider_TorBridgesPreferenceEnabled_Success() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException {
+        Provider provider = getConfiguredProviderAPIv4();
+
+        SharedPreferences sharedPreferences = new MockSharedPreferences();
+        sharedPreferences.edit().putBoolean(USE_BRIDGES, true).putBoolean(USE_SNOWFLAKE, true).commit();
+        PreferenceHelper preferenceHelper = mockPreferenceHelper(provider, sharedPreferences);
+        CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
+        ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR_API_V4);
+
+        providerApiManager = new ProviderApiManager(mockResources, new ProviderApiManagerTest.TestProviderApiServiceCallback());
+
+        Intent providerApiCommand = new Intent();
+        providerApiCommand.putExtra(PROVIDER_KEY, provider);
+        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
+        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_OK));
+        providerApiCommand.putExtra(PARAMETERS, new Bundle());
+
+        providerApiManager.handleIntent(providerApiCommand);
+        assertEquals(8118, TorStatusObservable.getProxyPort());
+    }
+
+
+    @Test
+    public void test_handleIntentUpdateVPNCertificate_TorBridgesPreferencesTrue_TorStartedAndSuccess() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException {
+        Provider provider = getConfiguredProviderAPIv4();
+
+        SharedPreferences sharedPreferences = new MockSharedPreferences();
+        sharedPreferences.edit().putBoolean(USE_BRIDGES, true).putBoolean(USE_SNOWFLAKE, true).commit();
+        PreferenceHelper preferenceHelper = mockPreferenceHelper(provider, sharedPreferences);
+        CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
+        RSAHelper rsaHelper = mockRSAHelper();
+        ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR_API_V4);
+
+        providerApiManager = new ProviderApiManager(mockResources, new ProviderApiManagerTest.TestProviderApiServiceCallback());
+
+        Intent providerApiCommand = new Intent();
+        providerApiCommand.putExtra(PROVIDER_KEY, provider);
+        providerApiCommand.setAction(UPDATE_INVALID_VPN_CERTIFICATE);
+        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE));
+        providerApiCommand.putExtra(PARAMETERS, new Bundle());
+
+        providerApiManager.handleIntent(providerApiCommand);
+        assertNotEquals(-1, TorStatusObservable.getProxyPort());
+    }
+
+    @Test
+    public void test_handleIntentUpdateVPNCertificate_TorBridgesPreferencesTrue_TorException_Failure() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException {
+        Provider provider = getConfiguredProviderAPIv4();
+
+        SharedPreferences sharedPreferences = new MockSharedPreferences();
+        sharedPreferences.edit().putBoolean(USE_BRIDGES, true).putBoolean(USE_SNOWFLAKE, true).commit();
+        PreferenceHelper preferenceHelper = mockPreferenceHelper(provider, sharedPreferences);
+        CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
+        ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR_API_V4);
+
+        providerApiManager = new ProviderApiManager(mockResources, new ProviderApiManagerTest.TestProviderApiServiceCallback(new IllegalStateException("Nothing works always."), true));
+
+        Bundle expectedResult = new Bundle();
+        expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
+        expectedResult.putString(ERRORS, "{\"initalAction\":\"ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE\"}");
+        expectedResult.putParcelable(PROVIDER_KEY, provider);
+
+        Intent providerApiCommand = new Intent();
+        providerApiCommand.putExtra(PROVIDER_KEY, provider);
+        providerApiCommand.setAction(UPDATE_INVALID_VPN_CERTIFICATE);
+        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(TOR_EXCEPTION, expectedResult));
+        providerApiCommand.putExtra(PARAMETERS, new Bundle());
+
+        providerApiManager.handleIntent(providerApiCommand);
+        assertEquals(-1, TorStatusObservable.getProxyPort());
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java b/app/src/test/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV3Test.java
index b8c6d0c9..a446bcfa 100644
--- a/app/src/test/java/se/leap/bitmaskclient/eip/ProviderApiManagerTest.java
+++ b/app/src/test/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV3Test.java
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package se.leap.bitmaskclient.eip;
+package se.leap.bitmaskclient.providersetup;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -26,15 +26,14 @@ import static se.leap.bitmaskclient.base.models.Constants.USE_BRIDGES;
 import static se.leap.bitmaskclient.base.models.Constants.USE_SNOWFLAKE;
 import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_DOWNLOADED_GEOIP_JSON;
 import static se.leap.bitmaskclient.providersetup.ProviderAPI.CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_GEOIP_JSON;
 import static se.leap.bitmaskclient.providersetup.ProviderAPI.ERRORS;
 import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_DOWNLOADED_GEOIP_JSON;
 import static se.leap.bitmaskclient.providersetup.ProviderAPI.INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.MISSING_NETWORK_CONNECTION;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.PARAMETERS;
 import static se.leap.bitmaskclient.providersetup.ProviderAPI.PROVIDER_NOK;
 import static se.leap.bitmaskclient.providersetup.ProviderAPI.PROVIDER_OK;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.TOR_EXCEPTION;
-import static se.leap.bitmaskclient.providersetup.ProviderAPI.TOR_TIMEOUT;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.SET_UP_PROVIDER;
+import static se.leap.bitmaskclient.providersetup.ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE;
 import static se.leap.bitmaskclient.testutils.BackendMockResponses.BackendMockProvider.TestBackendErrorCase.ERROR_CASE_FETCH_EIP_SERVICE_CERTIFICATE_INVALID;
 import static se.leap.bitmaskclient.testutils.BackendMockResponses.BackendMockProvider.TestBackendErrorCase.ERROR_CASE_MICONFIGURED_PROVIDER;
 import static se.leap.bitmaskclient.testutils.BackendMockResponses.BackendMockProvider.TestBackendErrorCase.ERROR_CASE_UPDATED_CERTIFICATE;
@@ -75,17 +74,15 @@ import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateEncodingException;
 import java.util.concurrent.TimeoutException;
 
-import se.leap.bitmaskclient.BuildConfig;
 import se.leap.bitmaskclient.base.models.Provider;
 import se.leap.bitmaskclient.base.utils.BuildConfigHelper;
 import se.leap.bitmaskclient.base.utils.CertificateHelper;
 import se.leap.bitmaskclient.base.utils.HandlerProvider;
 import se.leap.bitmaskclient.base.utils.PreferenceHelper;
 import se.leap.bitmaskclient.base.utils.RSAHelper;
-import se.leap.bitmaskclient.providersetup.ProviderAPI;
 import se.leap.bitmaskclient.providersetup.ProviderApiConnector;
-import se.leap.bitmaskclient.providersetup.ProviderApiManager;
 import se.leap.bitmaskclient.providersetup.ProviderApiManagerBase;
+import se.leap.bitmaskclient.providersetup.ProviderApiManagerV3;
 import se.leap.bitmaskclient.testutils.MockSharedPreferences;
 import se.leap.bitmaskclient.tor.TorStatusObservable;
 
@@ -94,12 +91,12 @@ import se.leap.bitmaskclient.tor.TorStatusObservable;
  * Created by cyberta on 04.01.18.
  */
 
-public class ProviderApiManagerTest {
+public class ProviderApiManagerV3Test {
 
     private Resources mockResources;
     private Context mockContext;
 
-    private ProviderApiManager providerApiManager;
+    private ProviderApiManagerV3 providerApiManager;
 
     static class TestProviderApiServiceCallback implements ProviderApiManagerBase.ProviderApiServiceCallback {
         Throwable startTorServiceException;
@@ -171,6 +168,7 @@ public class ProviderApiManagerTest {
     public void setUp() throws Exception {
         mockContext = mockContext();
         mockResources = mockResources(getClass().getClassLoader().getResourceAsStream("error_messages.json"));
+
         HandlerProvider handlerProvider = new HandlerProvider((r, delay) -> new Thread(r).start());
         BuildConfigHelper buildConfigHelper = mockBuildConfigHelper(true);
         TorStatusObservable torStatusObservable = TorStatusObservable.getInstance();
@@ -183,20 +181,14 @@ public class ProviderApiManagerTest {
     public void test_handleIntentSetupProvider_noProviderMainURL() throws IOException, JSONException {
         Provider provider = new Provider("");
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
         Bundle expectedResult = new Bundle();
 
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putString(ERRORS, "{\"errors\":\"It doesn't seem to be a Bitmask provider.\"}");
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
     @Test
@@ -206,17 +198,12 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector providerApiConnector = mockProviderApiConnector(NO_ERROR);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, true);
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_OK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_OK, expectedResult));
     }
 
     @Test
@@ -226,20 +213,13 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
         Bundle expectedResult = new Bundle();
 
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, true);
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_OK, expectedResult));
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_OK, expectedResult));
     }
 
     @Test
@@ -249,19 +229,13 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, true);
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_OK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_OK, expectedResult));
     }
 
     @Test
@@ -271,19 +245,13 @@ public class ProviderApiManagerTest {
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
         CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29495");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_CERTIFICATE_PINNING\",\"errors\":\"Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
     @Test
@@ -293,20 +261,14 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29495");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_CERTIFICATE_PINNING\",\"errors\":\"Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
     @Test
@@ -316,20 +278,14 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29495");
 
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_CERTIFICATE_PINNING\",\"errors\":\"Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
 
@@ -339,20 +295,14 @@ public class ProviderApiManagerTest {
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_CERTIFICATE\",\"errors\":\"Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
     @Test
@@ -362,20 +312,14 @@ public class ProviderApiManagerTest {
         PreferenceHelper.getEipDefinitionFromPreferences();
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_CERTIFICATE\",\"errors\":\"Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
     @Test
@@ -385,7 +329,7 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_CASE_UPDATED_CERTIFICATE);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_CERTIFICATE\",\"errors\":\"Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
@@ -393,12 +337,7 @@ public class ProviderApiManagerTest {
 
         Intent providerApiCommand = new Intent();
 
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
     @Test
@@ -407,21 +346,14 @@ public class ProviderApiManagerTest {
         PreferenceHelper preferenceHelper = mockPreferenceHelper(getConfiguredProvider());
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_CASE_UPDATED_CERTIFICATE);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_INVALID_CERTIFICATE\",\"errors\":\"Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.\"}");
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
     @Test
@@ -433,29 +365,19 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_CASE_MICONFIGURED_PROVIDER);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putString(ERRORS, "{\"errors\":\"There was an error configuring Bitmask with your chosen provider.\"}");
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
 
     @Test
     public void test_handleIntentSetupProvider_preseededCustomProviderAndCA_failedConfiguration() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, JSONException {
-        if ("insecure".equals(BuildConfig.FLAVOR_implementation )) {
-            return;
-        }
         Provider provider = getConfiguredProvider();
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
 
@@ -463,21 +385,14 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         BuildConfigHelper buildConfigHelper = mockBuildConfigHelper(false);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putString(ERRORS, "{\"errors\":\"There was an error configuring RiseupVPN.\"}");
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
     @Test
@@ -488,88 +403,56 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, true);
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_OK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_OK, expectedResult));
     }
 
     @Test
     public void test_handleIntentSetupProvider_failingEipServiceFetch_failedConfiguration() throws IOException, NoSuchAlgorithmException, CertificateEncodingException {
-        if ("insecure".equals(BuildConfig.FLAVOR_implementation )) {
-            return;
-        }
-
         Provider provider = new Provider("https://riseup.net");
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_CASE_FETCH_EIP_SERVICE_CERTIFICATE_INVALID);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putParcelable(PROVIDER_KEY, provider);
         expectedResult.putString(ERRORS, "This is not a trusted Bitmask provider.");
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK, expectedResult));
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
 
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK, expectedResult));
     }
 
     @Test
     public void test_handleIntentGetGeoip_happyPath() throws IOException, NoSuchAlgorithmException, CertificateEncodingException, JSONException {
-        if ("insecure".equals(BuildConfig.FLAVOR_implementation )) {
-            return;
-        }
-
-        Provider inputProvider = getConfiguredProvider();
-        inputProvider.setGeoIpJson(new JSONObject());
-        PreferenceHelper preferenceHelper = mockPreferenceHelper(inputProvider);
+        Provider provider = getConfiguredProvider();
+        provider.setGeoIpJson(new JSONObject());
+        PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
         Provider expectedProvider = getConfiguredProvider();
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(EIP_ACTION_START, true);
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, true);
         expectedResult.putParcelable(PROVIDER_KEY, expectedProvider);
 
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.setAction(ProviderAPI.DOWNLOAD_GEOIP_JSON);
         Bundle extrasBundle = new Bundle();
         extrasBundle.putBoolean(EIP_ACTION_START, true);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(CORRECTLY_DOWNLOADED_GEOIP_JSON, expectedResult));
-        providerApiCommand.putExtra(PROVIDER_KEY, inputProvider);
-        providerApiCommand.putExtra(PARAMETERS, extrasBundle);
-
-        providerApiManager.handleIntent(providerApiCommand);
 
+        providerApiManager.handleAction(DOWNLOAD_GEOIP_JSON, provider, extrasBundle, mockResultReceiver(CORRECTLY_DOWNLOADED_GEOIP_JSON, expectedResult));
     }
 
 
     @Test
     public void test_handleIntentGetGeoip_serviceDown_failToDownload() throws IOException, NoSuchAlgorithmException, CertificateEncodingException, JSONException {
-        if ("insecure".equals(BuildConfig.FLAVOR_implementation)) {
-            return;
-        }
-
         Provider provider = getConfiguredProvider();
         SharedPreferences mockSharedPref = new MockSharedPreferences();
         mockSharedPref.edit().
@@ -578,53 +461,35 @@ public class ProviderApiManagerTest {
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider, mockSharedPref);
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_GEOIP_SERVICE_IS_DOWN);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(EIP_ACTION_START, true);
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.setAction(ProviderAPI.DOWNLOAD_GEOIP_JSON);
         Bundle extrasBundle = new Bundle();
         extrasBundle.putBoolean(EIP_ACTION_START, true);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(INCORRECTLY_DOWNLOADED_GEOIP_JSON, expectedResult));
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.putExtra(PARAMETERS, extrasBundle);
-
-        providerApiManager.handleIntent(providerApiCommand);
-
+        providerApiManager.handleAction(DOWNLOAD_GEOIP_JSON, provider, extrasBundle,  mockResultReceiver(INCORRECTLY_DOWNLOADED_GEOIP_JSON, expectedResult));
     }
 
     @Test
     public void test_handleIntentGetGeoip_serviceDown_torNotStarted() throws IOException, NoSuchAlgorithmException, CertificateEncodingException, JSONException, TimeoutException, InterruptedException {
-        if ("insecure".equals(BuildConfig.FLAVOR_implementation)) {
-            return;
-        }
-
         Provider provider = getConfiguredProvider();
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_GEOIP_SERVICE_IS_DOWN_TOR_FALLBACK);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(EIP_ACTION_START, true);
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.setAction(ProviderAPI.DOWNLOAD_GEOIP_JSON);
         Bundle extrasBundle = new Bundle();
         extrasBundle.putBoolean(EIP_ACTION_START, true);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(INCORRECTLY_DOWNLOADED_GEOIP_JSON, expectedResult));
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.putExtra(PARAMETERS, extrasBundle);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(DOWNLOAD_GEOIP_JSON, provider, extrasBundle, mockResultReceiver(INCORRECTLY_DOWNLOADED_GEOIP_JSON, expectedResult));
+        
         // also assert that Tor was not allowed to start
         assertEquals(-1, TorStatusObservable.getProxyPort());
 
@@ -632,39 +497,26 @@ public class ProviderApiManagerTest {
 
     @Test
     public void test_handleIntentGetGeoip_didNotReachTimeoutToFetchNew_returnsFailure() throws IOException, NoSuchAlgorithmException, CertificateEncodingException, JSONException {
-        if ("insecure".equals(BuildConfig.FLAVOR_implementation)) {
-            return;
-        }
-
         Provider provider = getConfiguredProvider();
         provider.setLastGeoIpUpdate(System.currentTimeMillis());
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(EIP_ACTION_START, true);
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.setAction(ProviderAPI.DOWNLOAD_GEOIP_JSON);
         Bundle extrasBundle = new Bundle();
         extrasBundle.putBoolean(EIP_ACTION_START, true);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(INCORRECTLY_DOWNLOADED_GEOIP_JSON, expectedResult));
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.putExtra(PARAMETERS, extrasBundle);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(DOWNLOAD_GEOIP_JSON, provider, extrasBundle, mockResultReceiver(INCORRECTLY_DOWNLOADED_GEOIP_JSON, expectedResult));
+        
     }
 
     @Test
     public void test_handleIntentGetGeoip_noGeoipServiceURLDefined_returnsFailure() throws IOException, NoSuchAlgorithmException, CertificateEncodingException, JSONException {
-        if ("insecure".equals(BuildConfig.FLAVOR_implementation)) {
-            return;
-        }
 
         Provider provider = getConfiguredProvider();
         provider.setGeoipUrl(null);
@@ -672,23 +524,14 @@ public class ProviderApiManagerTest {
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
         CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(EIP_ACTION_START, true);
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
         expectedResult.putParcelable(PROVIDER_KEY, provider);
 
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.setAction(ProviderAPI.DOWNLOAD_GEOIP_JSON);
-        Bundle extrasBundle = new Bundle();
-        extrasBundle.putBoolean(EIP_ACTION_START, true);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(INCORRECTLY_DOWNLOADED_GEOIP_JSON, expectedResult));
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.putExtra(PARAMETERS, extrasBundle);
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(DOWNLOAD_GEOIP_JSON, provider, new Bundle(), mockResultReceiver(CORRECTLY_DOWNLOADED_GEOIP_JSON, expectedResult));
     }
 
     @Test
@@ -698,18 +541,12 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR_API_V4);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
         Bundle expectedResult = new Bundle();
         expectedResult.putBoolean(BROADCAST_RESULT_KEY, true);
         expectedResult.putParcelable(PROVIDER_KEY, provider);
-        Intent providerApiCommand = new Intent();
 
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_OK, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_OK, expectedResult));
     }
 
     @Test
@@ -719,15 +556,9 @@ public class ProviderApiManagerTest {
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
         CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_DNS_RESUOLUTION_TOR_FALLBACK);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_OK));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_OK));
         assertNotEquals(-1, TorStatusObservable.getProxyPort());
     }
 
@@ -738,15 +569,9 @@ public class ProviderApiManagerTest {
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
         CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_DNS_RESUOLUTION_TOR_FALLBACK);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback(new IllegalStateException("Tor service start not failed."), true));
-
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback(new IllegalStateException("Tor service start not failed."), true));
 
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK));
         assertEquals(-1, TorStatusObservable.getProxyPort());
     }
 
@@ -756,41 +581,13 @@ public class ProviderApiManagerTest {
         PreferenceHelper preferenceHelper = mockPreferenceHelper(provider);
         CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_DNS_RESUOLUTION_TOR_FALLBACK);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback(true, true));
-
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_NOK));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback(true, true));
 
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_NOK));
         assertEquals(-1, TorStatusObservable.getProxyPort());
     }
 
     @Test
-    public void test_handleIntentSetupProvider_TorBridgesPreferenceEnabled_Success() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException {
-        Provider provider = getConfiguredProviderAPIv4();
-
-        SharedPreferences sharedPreferences = new MockSharedPreferences();
-        sharedPreferences.edit().putBoolean(USE_BRIDGES, true).putBoolean(USE_SNOWFLAKE, true).commit();
-        PreferenceHelper preferenceHelper = mockPreferenceHelper(provider, sharedPreferences);
-        CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
-        ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR_API_V4);
-
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
-
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_OK));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
-        assertEquals(8118, TorStatusObservable.getProxyPort());
-    }
-
-    @Test
     public void test_handleIntentSetupProvider_TorBridgesDisabled_TorNotStarted() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException {
         Provider provider = getConfiguredProviderAPIv4();
 
@@ -800,15 +597,9 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR_API_V4);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(PROVIDER_OK));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(SET_UP_PROVIDER, provider, new Bundle(), mockResultReceiver(PROVIDER_OK));
         assertEquals(-1, TorStatusObservable.getProxyPort());
     }
 
@@ -820,15 +611,9 @@ public class ProviderApiManagerTest {
         RSAHelper rsaHelper = mockRSAHelper();
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_DNS_RESUOLUTION_TOR_FALLBACK);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(UPDATE_INVALID_VPN_CERTIFICATE, provider, new Bundle(), mockResultReceiver(CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE));
         assertEquals(8118, TorStatusObservable.getProxyPort());
     }
 
@@ -842,112 +627,9 @@ public class ProviderApiManagerTest {
         CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
         ProviderApiConnector mockedApiConnector = mockProviderApiConnector(ERROR_DNS_RESUOLUTION_TOR_FALLBACK);
 
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
-
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
+        providerApiManager = new ProviderApiManagerV3(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
 
-        providerApiManager.handleIntent(providerApiCommand);
+        providerApiManager.handleAction(UPDATE_INVALID_VPN_CERTIFICATE, provider, new Bundle(), mockResultReceiver(INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE));
         assertEquals(-1, TorStatusObservable.getProxyPort());
     }
-
-    @Test
-    public void test_handleIntentUpdateVPNCertificate_TorBridgesPreferencesTrue_TorStartedAndSuccess() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException {
-        Provider provider = getConfiguredProviderAPIv4();
-
-        SharedPreferences sharedPreferences = new MockSharedPreferences();
-        sharedPreferences.edit().putBoolean(USE_BRIDGES, true).putBoolean(USE_SNOWFLAKE, true).commit();
-        PreferenceHelper preferenceHelper = mockPreferenceHelper(provider, sharedPreferences);
-        CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
-        RSAHelper rsaHelper = mockRSAHelper();
-        ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR_API_V4);
-
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback());
-
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
-        assertNotEquals(-1, TorStatusObservable.getProxyPort());
-    }
-
-    @Test
-    public void test_handleIntentUpdateVPNCertificate_TorBridgesPreferencesTrue_TorException_Failure() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException {
-        Provider provider = getConfiguredProviderAPIv4();
-
-        SharedPreferences sharedPreferences = new MockSharedPreferences();
-        sharedPreferences.edit().putBoolean(USE_BRIDGES, true).putBoolean(USE_SNOWFLAKE, true).commit();
-        PreferenceHelper preferenceHelper = mockPreferenceHelper(provider, sharedPreferences);
-        CertificateHelper certHelper = mockCertificateHelper(" a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
-        ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR_API_V4);
-
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback(new IllegalStateException("Nothing works always."), true));
-
-        Bundle expectedResult = new Bundle();
-        expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
-        expectedResult.putString(ERRORS, "{\"initalAction\":\"ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE\"}");
-        expectedResult.putParcelable(PROVIDER_KEY, provider);
-
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(TOR_EXCEPTION, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
-        assertEquals(-1, TorStatusObservable.getProxyPort());
-    }
-
-    @Test
-    public void test_handleIntentSetupProvider_TorBridgesPreferencesEnabledTimeout_TimeoutError() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, TimeoutException, InterruptedException {
-        Provider provider = getConfiguredProviderAPIv4();
-        SharedPreferences sharedPreferences = new MockSharedPreferences();
-        sharedPreferences.edit().putBoolean(USE_BRIDGES, true).putBoolean(USE_SNOWFLAKE, true).commit();
-        PreferenceHelper preferenceHelper = mockPreferenceHelper(provider, sharedPreferences);
-        ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR_API_V4);
-
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback(true, true));
-
-        Bundle expectedResult = new Bundle();
-        expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
-        expectedResult.putString(ERRORS, "{\"errorId\":\"ERROR_TOR_TIMEOUT\",\"initalAction\":\"setUpProvider\",\"errors\":\"Starting bridges failed. Do you want to retry or continue with an unobfuscated secure connection to configure Bitmask?\"}");
-        expectedResult.putParcelable(PROVIDER_KEY, provider);
-
-        Intent providerApiCommand = new Intent();
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(TOR_TIMEOUT, expectedResult));
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-
-        providerApiManager.handleIntent(providerApiCommand);
-        assertEquals(-1, TorStatusObservable.getProxyPort());
-    }
-
-    @Test
-    public void test_handleIntentSetupProvider_noNetwork_NetworkError() throws IOException, CertificateEncodingException, NoSuchAlgorithmException, JSONException {
-        Provider provider = getConfiguredProvider();
-
-        CertificateHelper certHelper = mockCertificateHelper("a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494");
-        ProviderApiConnector mockedApiConnector = mockProviderApiConnector(NO_ERROR);
-        providerApiManager = new ProviderApiManager(mockResources, mockClientGenerator(), new TestProviderApiServiceCallback(null, false));
-        Bundle expectedResult = new Bundle();
-
-        expectedResult.putBoolean(BROADCAST_RESULT_KEY, false);
-        expectedResult.putString(ERRORS, "{\"errors\":\"Bitmask has no internet connection. Please check your WiFi and cellular data settings.\"}");
-        expectedResult.putParcelable(PROVIDER_KEY, provider);
-
-        Intent providerApiCommand = new Intent();
-
-        providerApiCommand.setAction(ProviderAPI.SET_UP_PROVIDER);
-        providerApiCommand.putExtra(ProviderAPI.RECEIVER_KEY, mockResultReceiver(MISSING_NETWORK_CONNECTION, expectedResult));
-        providerApiCommand.putExtra(PROVIDER_KEY, provider);
-        providerApiCommand.putExtra(PARAMETERS, new Bundle());
-        providerApiManager.handleIntent(providerApiCommand);
-    }
 }