After loggin in successfully, the new client certificate is downloaded.

It is stored in SharedPrefs, with ConfigHelper.cert_key (="cert") key.

1 files changed, 13 insertions, 4 deletions

diff --git a/src/se/leap/leapclient/LeapHttpClient.java b/src/se/leap/leapclient/LeapHttpClient.java
index f9119823..4de7ae08 100644
--- a/src/se/leap/leapclient/LeapHttpClient.java
+++ b/src/se/leap/leapclient/LeapHttpClient.java
@@ -9,6 +9,8 @@ import org.apache.http.conn.scheme.SchemeRegistry;
 import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.SingleClientConnManager;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import android.content.Context;
 
@@ -49,13 +51,20 @@ public class LeapHttpClient extends DefaultHttpClient {
 	          throw new AssertionError(e);
 	      }
 	  }
-	  
+
 	  public static LeapHttpClient getInstance(Context context) {
 		  if(client == null) {
 			  client = new LeapHttpClient(context);
-			  String cert_string = ConfigHelper.getStringFromSharedPref(ConfigHelper.cert_key);
-			  if(!cert_string.isEmpty()) {
-				ConfigHelper.addTrustedCertificate("recovered_certificate", cert_string);
+			  String cert_json_string = ConfigHelper.getStringFromSharedPref(ConfigHelper.main_cert_key);
+			  String cert_string;
+			  try {
+				  cert_string = new JSONObject(cert_json_string).getString(ConfigHelper.main_cert_key);
+				  if(!cert_string.isEmpty()) {
+					  ConfigHelper.addTrustedCertificate("recovered_certificate", cert_string);
+				  }
+			  } catch (JSONException e) {
+				  // TODO Auto-generated catch block
+				  e.printStackTrace();
 			  }
 		  }
 		  return client;