After downloading provider.json successfully, ConfigurationWizard now

can download eip-service.json and ca.crt without having the latter as a
predefined trusted certificate. It does not ask anything about trusting
the new certificate as far as selecting a custom provider means that the
user trusts that url.

Next step: make provider.json also downloadable from https address using
ca.cert not trusted.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/se/leap/leapclient/ConfigurationWizard.java b/src/se/leap/leapclient/ConfigurationWizard.java
index dcefb27..69e13f1 100644
--- a/src/se/leap/leapclient/ConfigurationWizard.java
+++ b/src/se/leap/leapclient/ConfigurationWizard.java
@@ -1,6 +1,7 @@
 package se.leap.leapclient;

 

 import java.io.IOException;

+import java.io.InputStream;

 import java.io.InputStreamReader;

 import java.util.Iterator;

 import java.util.Scanner;

@@ -63,6 +64,11 @@ public class ConfigurationWizard extends Activity
         

         loadPreseededProviders();

         

+        if(ConfigHelper.getKeystore() == null) {

+        	InputStream keystore_input_stream = getResources().openRawResource(R.raw.leapkeystore);

+        	ConfigHelper.getNewKeystore(keystore_input_stream);

+        }

+        

         // Only create our fragments if we're not restoring a saved instance

         if ( savedInstanceState == null ){

         	// TODO Some welcome screen?