Merge branch 'feature/remove-shared-preferences-methods-from-ConfigHelper' into develop

Conflicts:
	src/se/leap/bitmaskclient/Dashboard.java

1 files changed, 1 insertions, 8 deletions

diff --git a/src/se/leap/bitmaskclient/LeapHttpClient.java b/src/se/leap/bitmaskclient/LeapHttpClient.java
index 837da236..885b5105 100644
--- a/src/se/leap/bitmaskclient/LeapHttpClient.java
+++ b/src/se/leap/bitmaskclient/LeapHttpClient.java
@@ -34,7 +34,6 @@ import android.content.Context;
  *
  */
 public class LeapHttpClient extends DefaultHttpClient {
-	final Context context;
 
 	private static LeapHttpClient client;
 
@@ -43,10 +42,8 @@ public class LeapHttpClient extends DefaultHttpClient {
 	 * @param context
 	 * @return the new client.
 	 */
-	public static LeapHttpClient getInstance(Context context) {
+	public static LeapHttpClient getInstance(String cert_string) {
 		if(client == null) {
-			client = new LeapHttpClient(context);
-			String cert_string = ConfigHelper.getStringFromSharedPref(Provider.CA_CERT);
 			if(cert_string != null) {
 				ConfigHelper.addTrustedCertificate("provider_ca_certificate", cert_string);
 			}
@@ -77,8 +74,4 @@ public class LeapHttpClient extends DefaultHttpClient {
 			throw new AssertionError(e);
 		}
 	}
-
-	public LeapHttpClient(Context context) {
-		this.context = context;
-	}
 }