Merge branch '8827_handle_switch_provider' into '0.9.8'

8827 handle switch provider

See merge request leap/bitmask_android!38

1 files changed, 2 insertions, 10 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java b/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
index 1bf679f8..40b2ea7f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
@@ -59,11 +59,9 @@ import static se.leap.bitmaskclient.R.string.server_unreachable_message;
 
 public class OkHttpClientGenerator {
 
-    SharedPreferences preferences;
     Resources resources;
 
     public OkHttpClientGenerator(SharedPreferences preferences, Resources resources) {
-        this.preferences = preferences;
         this.resources = resources;
     }
 
@@ -71,16 +69,10 @@ public class OkHttpClientGenerator {
         return initHttpClient(initError, null);
     }
 
-    public OkHttpClient initSelfSignedCAHttpClient(JSONObject initError) {
-        String certificate = preferences.getString(Provider.CA_CERT, "");
-        return initHttpClient(initError, certificate);
+    public OkHttpClient initSelfSignedCAHttpClient(String caCert, JSONObject initError) {
+        return initHttpClient(initError, caCert);
     }
 
-    public OkHttpClient initSelfSignedCAHttpClient(JSONObject initError, String certificate) {
-        return initHttpClient(initError, certificate);
-    }
-
-
     private OkHttpClient initHttpClient(JSONObject initError, String certificate) {
         try {
             TLSCompatSocketFactory sslCompatFactory;