Merge branch 'wizard' into feature/wizard

Conflicts:
	src/se/leap/leapclient/ConfigHelper.java
	src/se/leap/leapclient/ConfigurationWizard.java
	src/se/leap/leapclient/ProviderAPI.java

1 files changed, 4 insertions, 11 deletions

diff --git a/src/se/leap/leapclient/LeapHttpClient.java b/src/se/leap/leapclient/LeapHttpClient.java
index fd6db745..51b76b2c 100644
--- a/src/se/leap/leapclient/LeapHttpClient.java
+++ b/src/se/leap/leapclient/LeapHttpClient.java
@@ -35,23 +35,16 @@ public class LeapHttpClient extends DefaultHttpClient {
 	  private SSLSocketFactory newSslSocketFactory() {
 	      try {
 	          // Get an instance of the Bouncy Castle KeyStore format
-	          KeyStore trusted = KeyStore.getInstance("BKS");
-	          // Get the raw resource, which contains the keystore with
-	          // your trusted certificates (root and any intermediate certs)
-	          InputStream in = context.getResources().openRawResource(R.raw.leapkeystore);
-	          try {
-	              // Initialize the keystore with the provided trusted certificates
-	              // Also provide the password of the keystore
-	              trusted.load(in, "uer92jf".toCharArray());
-	          } finally {
-	              in.close();
-	          }
+	          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);