1 files changed, 40 insertions, 3 deletions

diff --git a/src/se/leap/bitmaskclient/ProviderAPI.java b/src/se/leap/bitmaskclient/ProviderAPI.java
index 62a51c32..ff6dd852 100644
--- a/src/se/leap/bitmaskclient/ProviderAPI.java
+++ b/src/se/leap/bitmaskclient/ProviderAPI.java
@@ -27,6 +27,7 @@ import java.net.CookieManager;
 import java.net.CookiePolicy;
 import java.net.MalformedURLException;
 import java.net.SocketTimeoutException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
@@ -69,6 +70,7 @@ import android.os.ResultReceiver;
 import android.util.Base64;
 import android.util.Log;
 
+
 /**
  * Implements HTTP api methods used to manage communications with the provider server.
  * 
@@ -358,6 +360,9 @@ public class ProviderAPI extends IntentService {
 			session_idAndM2.put(ConfigHelper.SESSION_ID_COOKIE_KEY, session_id_cookie.getName());
 			session_idAndM2.put(ConfigHelper.SESSION_ID_KEY, session_id_cookie.getValue());*/
 			session_idAndM2.put(LeapSRPSession.M2, ConfigHelper.trim(M2_not_trimmed));
+			CookieHandler.setDefault(null); // we don't need cookies anymore
+			String token = json_response.getString(LeapSRPSession.TOKEN);
+			LeapSRPSession.setToken(token);
 		}
 		return session_idAndM2;
 	}
@@ -429,12 +434,35 @@ public class ProviderAPI extends IntentService {
 
 	    return result.toString();
 	}
+	
+	
+	
+	
 	/**
 	 * Downloads a provider.json from a given URL, adding a new provider using the given name.  
 	 * @param task containing a boolean meaning if the provider is custom or not, another boolean meaning if the user completely trusts this provider, the provider name and its provider.json url.
 	 * @return a bundle with a boolean value mapped to a key named RESULT_KEY, and which is true if the update was successful. 
 	 */
 	private Bundle setUpProvider(Bundle task) {
+//<<<<<<< HEAD
+//		Bundle result = new Bundle();
+//		int progress = 0;
+//		boolean danger_on = task.getBoolean(ProviderItem.DANGER_ON);
+//		String provider_main_url = task.getString(Provider.MAIN_URL);
+//		if(downloadCACert(provider_main_url, danger_on)) {
+//			broadcast_progress(progress++);
+//			result.putBoolean(RESULT_KEY, true);
+//			if(getAndSetProviderJson(provider_main_url)) {
+//				broadcast_progress(progress++);
+//				if(getAndSetEipServiceJson())
+//					broadcast_progress(progress++);
+//			}
+//		}
+//		return result;
+//	}
+//	
+//	
+//=======
 		int progress = 0;
 		Bundle current_download = new Bundle();
 		
@@ -480,6 +508,7 @@ public class ProviderAPI extends IntentService {
 		return result;
 	}
 	
+
 	public static boolean caCertDownloaded() {
 		return CA_CERT_DOWNLOADED;
 	}
@@ -522,6 +551,7 @@ public class ProviderAPI extends IntentService {
 		return result;
 	}
 
+
 	
 	public static boolean providerJsonDownloaded() {
 		return PROVIDER_JSON_DOWNLOADED;
@@ -589,6 +619,8 @@ public class ProviderAPI extends IntentService {
 			provider_url = new URL(string_url);
 			URLConnection url_connection = provider_url.openConnection();
 			url_connection.setConnectTimeout(seconds_of_timeout*1000);
+			if(!LeapSRPSession.getToken().isEmpty())
+				url_connection.addRequestProperty(LeapSRPSession.TOKEN, LeapSRPSession.getToken());
 			json_file_content = new Scanner(url_connection.getInputStream()).useDelimiter("\\A").next();
 		} catch (MalformedURLException e) {
 			json_file_content = formatErrorMessage(R.string.malformed_url);
@@ -624,6 +656,8 @@ public class ProviderAPI extends IntentService {
 			HttpsURLConnection urlConnection =
 					(HttpsURLConnection)url.openConnection();
 			urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
+			if(!LeapSRPSession.getToken().isEmpty())
+				urlConnection.addRequestProperty(LeapSRPSession.TOKEN, LeapSRPSession.getToken());
 			json_file_content = new Scanner(urlConnection.getInputStream()).useDelimiter("\\A").next();
 		} catch (CertificateException e) {
 			// TODO Auto-generated catch block
@@ -743,6 +777,7 @@ public class ProviderAPI extends IntentService {
 
 			int responseCode = urlConnection.getResponseCode();
 			broadcast_progress(progress++);
+			LeapSRPSession.setToken("");
 			Log.d("logout", Integer.toString(responseCode));
 		} catch (ClientProtocolException e) {
 			// TODO Auto-generated catch block
@@ -783,11 +818,13 @@ public class ProviderAPI extends IntentService {
 		try {
 			String type_of_certificate = task.getString(ConfigurationWizard.TYPE_OF_CERTIFICATE);
 			JSONObject provider_json = ConfigHelper.getJsonFromSharedPref(Provider.KEY);
-			URL provider_main_url = new URL(provider_json.getString(Provider.API_URL));
-			String new_cert_string_url = provider_main_url.toString() + "/" + provider_json.getString(Provider.API_VERSION) + "/" + EIP.CERTIFICATE;
+			String provider_main_url = provider_json.getString(Provider.API_URL);
+			URL new_cert_string_url = new URL(provider_main_url + "/" + provider_json.getString(Provider.API_VERSION) + "/" + EIP.CERTIFICATE);
 
 			boolean danger_on = ConfigHelper.getBoolFromSharedPref(ProviderItem.DANGER_ON);
-			String cert_string = downloadWithProviderCA(new_cert_string_url, true);
+
+			String cert_string = downloadWithProviderCA(new_cert_string_url.toString(), danger_on);
+
 			if(!cert_string.isEmpty()) {
 				if(ConfigHelper.checkErroneousDownload(cert_string)) {
 					String reason_to_fail = provider_json.getString(ERRORS);