From 80a8106afc8956008beb9d1ed9396f1d695d5b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 13 May 2013 20:39:34 +0200
Subject: A bit more clean.

I've upper cased ConfigHelper constants.

I've created a new method in ConfigHelper, to send requests to a server,
that it's used when sending A and M1.
---
 src/se/leap/leapclient/LeapHttpClient.java | 96 +++++++++++++++---------------
 1 file changed, 48 insertions(+), 48 deletions(-)

(limited to 'src/se/leap/leapclient/LeapHttpClient.java')

diff --git a/src/se/leap/leapclient/LeapHttpClient.java b/src/se/leap/leapclient/LeapHttpClient.java
index 4de7ae0..a2ee8ad 100644
--- a/src/se/leap/leapclient/LeapHttpClient.java
+++ b/src/se/leap/leapclient/LeapHttpClient.java
@@ -16,57 +16,57 @@ import android.content.Context;
 
 public class LeapHttpClient extends DefaultHttpClient {
 	final Context context;
-	
+
 	private static LeapHttpClient client;
 
-	  public LeapHttpClient(Context context) {
-	      this.context = context;
-	  }
+	public static LeapHttpClient getInstance(Context context) {
+		if(client == null) {
+			client = new LeapHttpClient(context);
+			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;
+	}
+
+	@Override
+	protected ClientConnectionManager createClientConnectionManager() {
+		SchemeRegistry registry = new SchemeRegistry();
+		registry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
+		// Register for port 443 our SSLSocketFactory with our keystore
+		// to the ConnectionManager
+		registry.register(new Scheme("https", newSslSocketFactory(), 443));
+		return new SingleClientConnManager(getParams(), registry);
+	}
+
+	private SSLSocketFactory newSslSocketFactory() {
+		try {
+			// Get an instance of the Bouncy Castle KeyStore format
+			KeyStore trusted = ConfigHelper.getKeystore();
+
+			// Pass the keystore to the SSLSocketFactory. The factory is responsible
+			// for the verification of the server certificate.
+			SSLSocketFactory sf = new SSLSocketFactory(trusted);
 
-	  @Override
-	  protected ClientConnectionManager createClientConnectionManager() {
-	      SchemeRegistry registry = new SchemeRegistry();
-	      registry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
-	      // Register for port 443 our SSLSocketFactory with our keystore
-	      // to the ConnectionManager
-	      registry.register(new Scheme("https", newSslSocketFactory(), 443));
-	      return new SingleClientConnManager(getParams(), registry);
-	  }
+			// Hostname verification from certificate
+			// http://hc.apache.org/httpcomponents-client-ga/tutorial/html/connmgmt.html#d4e506
+			sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
 
-	  private SSLSocketFactory newSslSocketFactory() {
-	      try {
-	          // Get an instance of the Bouncy Castle KeyStore format
-	          KeyStore trusted = ConfigHelper.getKeystore();
-	          
-	          // Pass the keystore to the SSLSocketFactory. The factory is responsible
-	          // for the verification of the server certificate.
-	          SSLSocketFactory sf = new SSLSocketFactory(trusted);
-	          
-	          // Hostname verification from certificate
-	          // http://hc.apache.org/httpcomponents-client-ga/tutorial/html/connmgmt.html#d4e506
-	          sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
-	          
-	          return sf;
-	      } catch (Exception e) {
-	          throw new AssertionError(e);
-	      }
-	  }
+			return sf;
+		} catch (Exception e) {
+			throw new AssertionError(e);
+		}
+	}
 
-	  public static LeapHttpClient getInstance(Context context) {
-		  if(client == null) {
-			  client = new LeapHttpClient(context);
-			  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;
-	  }
+	public LeapHttpClient(Context context) {
+		this.context = context;
+	}
 }
-- 
cgit v1.2.3