1 files changed, 35 insertions, 15 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java b/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
index 7b9874e0..576e76e0 100644
--- a/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
@@ -62,7 +62,7 @@ public class OkHttpClientGenerator {
 
     Resources resources;
 
-    public OkHttpClientGenerator(SharedPreferences preferences, Resources resources) {
+    public OkHttpClientGenerator(/*SharedPreferences preferences,*/ Resources resources) {
         this.resources = resources;
     }
 
@@ -74,22 +74,21 @@ public class OkHttpClientGenerator {
         return initHttpClient(initError, caCert);
     }
 
+    public OkHttpClient init() {
+        try {
+            return createClient(null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     private OkHttpClient initHttpClient(JSONObject initError, String certificate) {
+        if (resources == null) {
+            return null;
+        }
         try {
-            TLSCompatSocketFactory sslCompatFactory;
-            ConnectionSpec spec = getConnectionSpec();
-            OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
-
-            if (!isEmpty(certificate)) {
-                sslCompatFactory = new TLSCompatSocketFactory(certificate);
-            } else {
-                sslCompatFactory = new TLSCompatSocketFactory();
-            }
-            sslCompatFactory.initSSLSocketFactory(clientBuilder);
-            clientBuilder.cookieJar(getCookieJar())
-                    .connectionSpecs(Collections.singletonList(spec));
-            clientBuilder.dns(new DnsResolver());
-            return clientBuilder.build();
+            return createClient(certificate);
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
             // TODO ca cert is invalid - show better error ?!
@@ -110,10 +109,31 @@ public class OkHttpClientGenerator {
         } catch (IOException e) {
             e.printStackTrace();
             addErrorMessageToJson(initError, resources.getString(error_io_exception_user_message));
+        } catch (Exception e) {
+            e.printStackTrace();
+            // unexpected exception, should never happen
+            // only to shorten the method signature createClient(String certificate)
         }
         return null;
     }
 
+    private OkHttpClient createClient(String certificate) throws Exception {
+        TLSCompatSocketFactory sslCompatFactory;
+        ConnectionSpec spec = getConnectionSpec();
+        OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
+
+        if (!isEmpty(certificate)) {
+            sslCompatFactory = new TLSCompatSocketFactory(certificate);
+        } else {
+            sslCompatFactory = new TLSCompatSocketFactory();
+        }
+        sslCompatFactory.initSSLSocketFactory(clientBuilder);
+        clientBuilder.cookieJar(getCookieJar())
+                .connectionSpecs(Collections.singletonList(spec));
+        clientBuilder.dns(new DnsResolver());
+        return clientBuilder.build();
+    }
+
 
 
     @NonNull