Merge branch 'develop' into release-0.8.0

2 files changed, 570 insertions, 586 deletions

diff --git a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
index c405d06f..78fcda56 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -1,281 +1,376 @@
-/**

- * Copyright (c) 2013 LEAP Encryption Access Project and contributers

- * 

- * This program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation, either version 3 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program. If not, see <http://www.gnu.org/licenses/>.

- */

- package se.leap.bitmaskclient;

-

-
-
-
-

-

-import android.app.Activity;

-import android.app.DialogFragment;

-import android.app.Fragment;

-import android.app.FragmentManager;

-import android.app.FragmentTransaction;

-import android.content.BroadcastReceiver;

-import android.content.Context;

-import android.content.Intent;

-import android.content.IntentFilter;

-import android.content.SharedPreferences;

-import android.content.res.AssetManager;

-import android.os.Bundle;

-import android.os.Handler;

-import android.util.Log;

-import android.view.Display;

-import android.view.Menu;

-import android.view.MenuItem;

-import android.view.View.MeasureSpec;

-import android.view.View;

-import android.view.ViewGroup;

-import android.view.WindowManager;

-import android.widget.ListAdapter;

-import android.widget.ListView;

-import android.widget.ProgressBar;

-import android.widget.ProgressBar;

-import android.widget.RelativeLayout;

-import android.widget.TextView;

-import java.io.IOException;

+/**
+ * Copyright (c) 2013 LEAP Encryption Access Project and contributers
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package se.leap.bitmaskclient;
+
+import android.app.Activity;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.res.AssetManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.Display;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View.MeasureSpec;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import android.widget.ProgressBar;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Iterator;

-import org.json.JSONException;

-import org.json.JSONObject;

+import java.util.Iterator;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import se.leap.bitmaskclient.DownloadFailedDialog.DownloadFailedDialogInterface;
 import se.leap.bitmaskclient.NewProviderDialog.NewProviderDialogInterface;
 import se.leap.bitmaskclient.ProviderAPIResultReceiver.Receiver;
 import se.leap.bitmaskclient.ProviderDetailFragment.ProviderDetailFragmentInterface;
 import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
+import se.leap.bitmaskclient.FragmentManagerEnhanced;
+
 import se.leap.bitmaskclient.R;
-

-/**

- * Activity that builds and shows the list of known available providers.

- * 

- * It also allows the user to enter custom providers with a button.

- * 

- * @author parmegv

- *

- */

-public class ConfigurationWizard extends Activity

-implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderDetailFragmentInterface, DownloadFailedDialogInterface, Receiver {

-

-	private ProgressBar mProgressBar;

-	private TextView progressbar_description;

-	private ProviderListFragment provider_list_fragment;

-	private Intent mConfigState = new Intent();

-	

-	final public static String TAG = "se.leap.bitmaskclient.ConfigurationWizard";

-	final public static String TYPE_OF_CERTIFICATE = "type_of_certificate";

-	final public static String ANON_CERTIFICATE = "anon_certificate";

-        final public static String AUTHED_CERTIFICATE = "authed_certificate";

-

-	final protected static String PROVIDER_SET = "PROVIDER SET";

-	final protected static String SERVICES_RETRIEVED = "SERVICES RETRIEVED";

+
+/**
+ * Activity that builds and shows the list of known available providers.
+ * 
+ * It also allows the user to enter custom providers with a button.
+ * 
+ * @author parmegv
+ *
+ */
+public class ConfigurationWizard extends Activity
+implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderDetailFragmentInterface, DownloadFailedDialogInterface, Receiver {
+
+	private ProgressBar mProgressBar;
+	private TextView progressbar_description;
+	private ProviderListFragment provider_list_fragment;
+	private Intent mConfigState = new Intent();
+	
+	final public static String TAG = ConfigurationWizard.class.getSimpleName();
+	final public static String TYPE_OF_CERTIFICATE = "type_of_certificate";
+	final public static String ANON_CERTIFICATE = "anon_certificate";
+        final public static String AUTHED_CERTIFICATE = "authed_certificate";
+
+	final protected static String PROVIDER_SET = "PROVIDER SET";
+	final protected static String SERVICES_RETRIEVED = "SERVICES RETRIEVED";
     final protected static String ASSETS_URL_FOLDER = "urls";
-    

-    public ProviderAPIResultReceiver providerAPI_result_receiver;

+    
+    public ProviderAPIResultReceiver providerAPI_result_receiver;
     private ProviderAPIBroadcastReceiver_Update providerAPI_broadcast_receiver_update;
 
-    private static SharedPreferences preferences;

+    private static SharedPreferences preferences;
+    FragmentManagerEnhanced fragment_manager;
     private static boolean setting_up_provider = false;
-    

-    @Override

-    protected void onCreate(Bundle savedInstanceState) {

-        super.onCreate(savedInstanceState);

+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 	preferences = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE);
-        

-        setContentView(R.layout.configuration_wizard_activity);

-	    mProgressBar = (ProgressBar) findViewById(R.id.progressbar_configuration_wizard);

-	    mProgressBar.setVisibility(ProgressBar.INVISIBLE);

-	    progressbar_description = (TextView) findViewById(R.id.progressbar_description);

-	    progressbar_description.setVisibility(TextView.INVISIBLE);

-        providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler());

-        providerAPI_result_receiver.setReceiver(this);

-	    providerAPI_broadcast_receiver_update = new ProviderAPIBroadcastReceiver_Update();

-	    IntentFilter update_intent_filter = new IntentFilter(ProviderAPI.UPDATE_PROGRESSBAR);

-	    update_intent_filter.addCategory(Intent.CATEGORY_DEFAULT);

-	    registerReceiver(providerAPI_broadcast_receiver_update, update_intent_filter);

-

-	    loadPreseededProviders();

-        

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

-        if ( savedInstanceState == null ){

-        	// TODO Some welcome screen?

-        	// We will need better flow control when we have more Fragments (e.g. user auth)

-        	provider_list_fragment = ProviderListFragment.newInstance();

-    		Bundle arguments = new Bundle();

-    		int configuration_wizard_request_code = getIntent().getIntExtra(Dashboard.REQUEST_CODE, -1);

-    		if(configuration_wizard_request_code == Dashboard.SWITCH_PROVIDER) {

-    			arguments.putBoolean(ProviderListFragment.SHOW_ALL_PROVIDERS, true);

-    		}

-			provider_list_fragment.setArguments(arguments);

-

-    		FragmentManager fragmentManager = getFragmentManager();

-    		fragmentManager.beginTransaction()

-    		.replace(R.id.configuration_wizard_layout, provider_list_fragment, ProviderListFragment.TAG)

-    		.commit();

-        }

-

-        // TODO: If exposing deep links into your app, handle intents here.

-    }

-

-	@Override

-	protected void onDestroy() {

-		super.onDestroy();

-		unregisterReceiver(providerAPI_broadcast_receiver_update);

-	}

-

-    public void refreshProviderList(int top_padding) {

-    	ProviderListFragment new_provider_list_fragment = new ProviderListFragment();

-		Bundle top_padding_bundle = new Bundle();

-		top_padding_bundle.putInt(ProviderListFragment.TOP_PADDING, top_padding);

-		new_provider_list_fragment.setArguments(top_padding_bundle);

-		

-		FragmentManager fragmentManager = getFragmentManager();

-		fragmentManager.beginTransaction()

-		.replace(R.id.configuration_wizard_layout, new_provider_list_fragment, ProviderListFragment.TAG)

-		.commit();

-    }

-    

-	@Override

-	public void onReceiveResult(int resultCode, Bundle resultData) {

-		if(resultCode == ProviderAPI.PROVIDER_OK) {

-				mConfigState.setAction(PROVIDER_SET);

-

-				if (preferences.getBoolean(EIP.ALLOWED_ANON, false)){

-					mConfigState.putExtra(SERVICES_RETRIEVED, true);

-					downloadAnonCert();

-				} else {

-					mProgressBar.incrementProgressBy(1);

-				    mProgressBar.setVisibility(ProgressBar.GONE);

-				    progressbar_description.setVisibility(TextView.GONE);

-					setResult(RESULT_OK);
-					showProviderDetails(getCurrentFocus());

-				}
-		} else if(resultCode == ProviderAPI.PROVIDER_NOK) {

-			//refreshProviderList(0);
-			String reason_to_fail = resultData.getString(ProviderAPI.ERRORS);

-			showDownloadFailedDialog(getCurrentFocus(), reason_to_fail);

-			mProgressBar.setVisibility(ProgressBar.GONE);

-			progressbar_description.setVisibility(TextView.GONE);
-			preferences.edit().remove(Provider.KEY).commit();

-			setting_up_provider = false;
-			setResult(RESULT_CANCELED, mConfigState);

-		}

-		else if(resultCode == ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE) {

-			mProgressBar.incrementProgressBy(1);

-		    mProgressBar.setVisibility(ProgressBar.GONE);

-		    progressbar_description.setVisibility(TextView.GONE);

-		    //refreshProviderList(0);

-		    setResult(RESULT_OK);

-		    showProviderDetails(getCurrentFocus());

-		} else if(resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE) {

-			//refreshProviderList(0);

-			mProgressBar.setVisibility(ProgressBar.GONE);

-		    progressbar_description.setVisibility(TextView.GONE);

-			//Toast.makeText(getApplicationContext(), R.string.incorrectly_downloaded_certificate_message, Toast.LENGTH_LONG).show();

-        	setResult(RESULT_CANCELED, mConfigState);

-		} else if(resultCode == AboutActivity.VIEWED) {
-		    // Do nothing, right now
-		    // I need this for CW to wait for the About activity to end before going back to Dashboard.
-		}
-	}

-

-	/**

-     * Callback method from {@link ProviderListFragment.Callbacks}

-     * indicating that the item with the given ID was selected.

-     */

-    @Override

-    public void onItemSelected(String id) {

-	    //TODO Code 2 pane view

-	//	resetOldConnection();

-	    ProviderItem selected_provider = getProvider(id);

-	    int provider_index = getProviderIndex(id);

-
-
-	    startProgressBar(provider_index+1);
-	    provider_list_fragment.hideAllBut(provider_index);
-
-	    boolean danger_on = true;
-	    if(preferences.contains(ProviderItem.DANGER_ON))
-	    	danger_on = preferences.getBoolean(ProviderItem.DANGER_ON, false);
-	    setUpProvider(selected_provider.providerMainUrl(), danger_on);
-    }

-    

-    @Override

-    public void onBackPressed() {

+	fragment_manager = new FragmentManagerEnhanced(getFragmentManager());
+
+	setUpInitialUI();
+
+	loadPreseededProviders();
+
+	setUpProviderAPIResultReceiver();
+        
+        // Only create our fragments if we're not restoring a saved instance
+        if ( savedInstanceState == null ){
+        	// TODO Some welcome screen?
+        	// We will need better flow control when we have more Fragments (e.g. user auth)
+	    setUpProviderList();
+        }
+
+        // TODO: If exposing deep links into your app, handle intents here.
+    }
+
+    private void setUpInitialUI() {
+	setContentView(R.layout.configuration_wizard_activity);
+
+	hideProgressBar();
+    }
+    
+    private void hideProgressBar() {	
+	mProgressBar = (ProgressBar) findViewById(R.id.progressbar_configuration_wizard);
+	mProgressBar.setVisibility(ProgressBar.INVISIBLE);
+	
+	progressbar_description = (TextView) findViewById(R.id.progressbar_description);
+	progressbar_description.setVisibility(TextView.INVISIBLE);
+    }
+
+    private void setUpProviderList() {
+	provider_list_fragment = ProviderListFragment.newInstance();
+	
+	Bundle arguments = new Bundle();
+	int configuration_wizard_request_code = getIntent().getIntExtra(Dashboard.REQUEST_CODE, -1);
+	if(configuration_wizard_request_code == Dashboard.SWITCH_PROVIDER)
+	    arguments.putBoolean(ProviderListFragment.SHOW_ALL_PROVIDERS, true);
+	
+	provider_list_fragment.setArguments(arguments);
+
+	putProviderListFragment(provider_list_fragment);
+    }
+
+    private void putProviderListFragment(ProviderListFragment fragment) {
+	
+	fragment_manager.replace(R.id.configuration_wizard_layout, provider_list_fragment, ProviderListFragment.TAG);
+    }
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		unregisterReceiver(providerAPI_broadcast_receiver_update);
+	}
+
+    private void setUpProviderAPIResultReceiver() {
+        providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler());
+        providerAPI_result_receiver.setReceiver(this);
+	providerAPI_broadcast_receiver_update = new ProviderAPIBroadcastReceiver_Update();
+	
+	IntentFilter update_intent_filter = new IntentFilter(ProviderAPI.UPDATE_PROGRESSBAR);
+	update_intent_filter.addCategory(Intent.CATEGORY_DEFAULT);
+	registerReceiver(providerAPI_broadcast_receiver_update, update_intent_filter);
+    }
+
+    @Override
+    public void onReceiveResult(int resultCode, Bundle resultData) {
+	if(resultCode == ProviderAPI.PROVIDER_OK) {
+	    mConfigState.setAction(PROVIDER_SET);
+
+	    if (preferences.getBoolean(EIP.ALLOWED_ANON, false)){
+		mConfigState.putExtra(SERVICES_RETRIEVED, true);
+		
+		downloadAnonCert();
+	    } else {
+		mProgressBar.incrementProgressBy(1);
+		hideProgressBar();
+		
+		setResult(RESULT_OK);
+		
+		showProviderDetails();
+	    }
+	} else if(resultCode == ProviderAPI.PROVIDER_NOK) {
+	    hideProgressBar();
+	    preferences.edit().remove(Provider.KEY).commit();
+	    setting_up_provider = false;
+	    
+	    setResult(RESULT_CANCELED, mConfigState);
+	    
+	    String reason_to_fail = resultData.getString(ProviderAPI.ERRORS);
+	    showDownloadFailedDialog(getCurrentFocus(), reason_to_fail);
+	}
+	else if(resultCode == ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE) {
+	    mProgressBar.incrementProgressBy(1);
+	    hideProgressBar();
+	    
+	    setResult(RESULT_OK);
+	    
+	    showProviderDetails();
+	} else if(resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE) {
+	    hideProgressBar();
+	    
+	    setResult(RESULT_CANCELED, mConfigState);
+	} else if(resultCode == AboutActivity.VIEWED) {
+	    // Do nothing, right now
+	    // I need this for CW to wait for the About activity to end before going back to Dashboard.
+	}
+    }
+
+	/**
+     * Callback method from {@link ProviderListFragment.Callbacks}
+     * indicating that the item with the given ID was selected.
+     */
+    @Override
+    public void onItemSelected(String id) {
+	//TODO Code 2 pane view
+	ProviderItem selected_provider = getProvider(id);
+	int provider_index = getProviderIndex(id);
+
+	startProgressBar(provider_index+1);
+	provider_list_fragment.hideAllBut(provider_index);
+
+	boolean danger_on = true;
+	if(preferences.contains(ProviderItem.DANGER_ON))
+	    danger_on = preferences.getBoolean(ProviderItem.DANGER_ON, false);
+	setUpProvider(selected_provider.providerMainUrl(), danger_on);
+    }
+    
+    @Override
+    public void onBackPressed() {
     	if(setting_up_provider) {
     		stopSettingUpProvider();
-    	} else {

+    	} else {
     		usualBackButton();
     	}
     }
-    

-    private void stopSettingUpProvider() {

-		ProviderAPI.stop();

-		mProgressBar.setVisibility(ProgressBar.GONE);

-		mProgressBar.setProgress(0);

-		progressbar_description.setVisibility(TextView.GONE);

-		preferences.edit().remove(Provider.KEY).commit();

-    	setting_up_provider = false;

+    
+    private void stopSettingUpProvider() {
+	ProviderAPI.stop();
+	mProgressBar.setVisibility(ProgressBar.GONE);
+	mProgressBar.setProgress(0);
+	progressbar_description.setVisibility(TextView.GONE);
+	preferences.edit().remove(Provider.KEY).commit();
+    	setting_up_provider = false;
 	showAllProviders();
-    }

-    

-    private void usualBackButton() {

-		try {

-			boolean is_provider_set_up = new JSONObject(preferences.getString(Provider.KEY, "no provider")) != null ? true : false;

-			boolean is_provider_set_up_truly = new JSONObject(preferences.getString(Provider.KEY, "no provider")).length() != 0 ? true : false;

-			if(!is_provider_set_up || !is_provider_set_up_truly) {

-				askDashboardToQuitApp();

-			} else {

-				setResult(RESULT_OK);

-			}

-		} catch (JSONException e) {

-			askDashboardToQuitApp();

-			super.onBackPressed();

-			e.printStackTrace();

-		}

-		super.onBackPressed();

-    }

-    private void askDashboardToQuitApp() {

-		Intent ask_quit = new Intent();

-		ask_quit.putExtra(Dashboard.ACTION_QUIT, Dashboard.ACTION_QUIT);

-		setResult(RESULT_CANCELED, ask_quit);

-    }

-

-    private ProviderItem getProvider(String name) {

-	    Iterator<ProviderItem> providers_iterator = ProviderListContent.ITEMS.iterator();

-	    while(providers_iterator.hasNext()) {

-		    ProviderItem provider = providers_iterator.next();

-		    if(provider.name().equalsIgnoreCase(name)) {

-			    return provider;

-		    }

-	    }

-	    return null;

-    }

-    

-    private String getId(String provider_main_url_string) {
+    }
+    
+    private void usualBackButton() {
+		try {
+			boolean is_provider_set_up = new JSONObject(preferences.getString(Provider.KEY, "no provider")) != null ? true : false;
+			boolean is_provider_set_up_truly = new JSONObject(preferences.getString(Provider.KEY, "no provider")).length() != 0 ? true : false;
+			if(!is_provider_set_up || !is_provider_set_up_truly) {
+				askDashboardToQuitApp();
+			} else {
+				setResult(RESULT_OK);
+			}
+		} catch (JSONException e) {
+			askDashboardToQuitApp();
+			super.onBackPressed();
+			e.printStackTrace();
+		}
+		super.onBackPressed();
+    }
+    private void askDashboardToQuitApp() {
+		Intent ask_quit = new Intent();
+		ask_quit.putExtra(Dashboard.ACTION_QUIT, Dashboard.ACTION_QUIT);
+		setResult(RESULT_CANCELED, ask_quit);
+    }
+
+    private ProviderItem getProvider(String name) {
+	    Iterator<ProviderItem> providers_iterator = ProviderListContent.ITEMS.iterator();
+	    while(providers_iterator.hasNext()) {
+		    ProviderItem provider = providers_iterator.next();
+		    if(provider.name().equalsIgnoreCase(name)) {
+			    return provider;
+		    }
+	    }
+	    return null;
+    }
+	
+	private void startProgressBar() {
+	    mProgressBar.setVisibility(ProgressBar.VISIBLE);
+	    progressbar_description.setVisibility(TextView.VISIBLE);
+	    mProgressBar.setProgress(0);
+	    mProgressBar.setMax(3);
+	}
+	
+	private void startProgressBar(int list_item_index) {
+	    startProgressBar();
+	    int measured_height = listItemHeight(list_item_index);
+	    mProgressBar.setTranslationY(measured_height);
+	    progressbar_description.setTranslationY(measured_height + mProgressBar.getHeight());
+	}
+
+    private int getProviderIndex(String id) {
+    	int index = 0;
+	    Iterator<ProviderItem> providers_iterator = ProviderListContent.ITEMS.iterator();
+	    while(providers_iterator.hasNext()) {
+		    ProviderItem provider = providers_iterator.next();
+		    if(provider.name().equalsIgnoreCase(id)) {
+			    break;
+		    } else index++;
+	    }
+	    return index;
+    }
+    
+    private int listItemHeight(int list_item_index) {
+        ListView provider_list_view = (ListView)findViewById(android.R.id.list);
+        ListAdapter provider_list_adapter = provider_list_view.getAdapter();
+        View listItem = provider_list_adapter.getView(0, null, provider_list_view);
+        listItem.setLayoutParams(new RelativeLayout.LayoutParams(
+                    RelativeLayout.LayoutParams.WRAP_CONTENT,
+                    RelativeLayout.LayoutParams.WRAP_CONTENT));
+        WindowManager wm = (WindowManager) getApplicationContext()
+                    .getSystemService(Context.WINDOW_SERVICE);
+        Display display = wm.getDefaultDisplay();
+        int screenWidth = display.getWidth(); // deprecated
+
+        int listViewWidth = screenWidth - 10 - 10;
+        int widthSpec = MeasureSpec.makeMeasureSpec(listViewWidth,
+                    MeasureSpec.AT_MOST);
+        listItem.measure(widthSpec, 0);
+
+        return listItem.getMeasuredHeight();
+}
+    
+    /**
+     * Loads providers data from url files contained in the assets folder
+     * @return true if the files were correctly read
+     */
+    private boolean loadPreseededProviders() {
+    	boolean loaded_preseeded_providers = true;
+	try {
+	    //TODO Put that folder in a better place (also inside the "for")	    
+	    String[] urls_filepaths = getAssets().list(ASSETS_URL_FOLDER); 
+	    for(String url_filepath : urls_filepaths) {
+		addNewProviderToList(url_filepath);
+	    }
+	} catch (IOException e) {
+	    loaded_preseeded_providers = false;
+	}
+	
+	return loaded_preseeded_providers;
+    }
+
+    private void addNewProviderToList(String url_filepath) {
+	String provider_main_url = extractProviderMainUrlFromAssetsFile(ASSETS_URL_FOLDER + "/" + url_filepath);
+	if(getId(provider_main_url).isEmpty()) {	    
+	    String provider_name = url_filepath.subSequence(0, url_filepath.lastIndexOf(".")).toString();
+	    ProviderListContent.addItem(new ProviderItem(provider_name, provider_main_url));
+	}
+    }
+
+    private String extractProviderMainUrlFromAssetsFile(String filepath) {
+	String provider_main_url = "";
+	try {	    
+	    InputStream input_stream_file_contents = getAssets().open(filepath);
+	    byte[] urls_file_bytes = new byte[input_stream_file_contents.available()];
+	    input_stream_file_contents.read(urls_file_bytes);
+	    String urls_file_content = new String(urls_file_bytes);
+	    JSONObject file_contents = new JSONObject(urls_file_content);
+	    provider_main_url = file_contents.getString(Provider.MAIN_URL);
+	} catch (JSONException e) {
+	} catch (IOException e) {
+	}
+	return provider_main_url;
+    }
+    
+    private String getId(String provider_main_url) {
 	try {
-	URL provider_url = new URL(provider_main_url_string);
-	URL aux_provider_url;
+	URL provider_url = new URL(provider_main_url);
 	Iterator<ProviderItem> providers_iterator = ProviderListContent.ITEMS.iterator();
 	while(providers_iterator.hasNext()) {
 	    ProviderItem provider = providers_iterator.next();
-	    aux_provider_url = new URL(provider.providerMainUrl());
+	    URL aux_provider_url = new URL(provider.providerMainUrl());
 	    if(isSameURL(provider_url, aux_provider_url)) {
 		return provider.name();
 	    }
@@ -284,7 +379,7 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 	    e.printStackTrace();
 	}
 	return "";
-    }

+    }
 
     /**
      * Checks, whether 2 urls are pointing to the same location.
@@ -306,218 +401,109 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 	}
 	return true;
     }
-	

-	private void startProgressBar() {

-	    mProgressBar.setVisibility(ProgressBar.VISIBLE);

-	    mProgressBar.setProgress(0);

-	    mProgressBar.setMax(3);

-	}

-	

-	private void startProgressBar(int list_item_index) {

-	    mProgressBar.setVisibility(ProgressBar.VISIBLE);

-	    progressbar_description.setVisibility(TextView.VISIBLE);

-	    mProgressBar.setProgress(0);

-	    mProgressBar.setMax(3);

-	    int measured_height = listItemHeight(list_item_index);

-	    mProgressBar.setTranslationY(measured_height);

-	    progressbar_description.setTranslationY(measured_height + mProgressBar.getHeight());

-	}

-

-    private int getProviderIndex(String id) {

-    	int index = 0;

-	    Iterator<ProviderItem> providers_iterator = ProviderListContent.ITEMS.iterator();

-	    while(providers_iterator.hasNext()) {

-		    ProviderItem provider = providers_iterator.next();

-		    if(provider.name().equalsIgnoreCase(id)) {

-			    break;

-		    } else index++;
-	    }

-	    return index;

-    }

-    

-    private int listItemHeight(int list_item_index) {

-        ListView provider_list_view = (ListView)findViewById(android.R.id.list);

-        ListAdapter provider_list_adapter = provider_list_view.getAdapter();

-        View listItem = provider_list_adapter.getView(0, null, provider_list_view);

-        listItem.setLayoutParams(new RelativeLayout.LayoutParams(

-                    RelativeLayout.LayoutParams.WRAP_CONTENT,

-                    RelativeLayout.LayoutParams.WRAP_CONTENT));

-        WindowManager wm = (WindowManager) getApplicationContext()

-                    .getSystemService(Context.WINDOW_SERVICE);

-        Display display = wm.getDefaultDisplay();

-        int screenWidth = display.getWidth(); // deprecated

-

-        int listViewWidth = screenWidth - 10 - 10;

-        int widthSpec = MeasureSpec.makeMeasureSpec(listViewWidth,

-                    MeasureSpec.AT_MOST);

-        listItem.measure(widthSpec, 0);

-

-        return listItem.getMeasuredHeight();

-}

-	

-    /**
-     * Loads providers data from url files contained in the assets folder
-     * @return true if the files were correctly read
-     */
-    private boolean loadPreseededProviders() {
-    	boolean loaded_preseeded_providers = false;
-        String[] urls_filepaths = null;
-	try {
-	    //TODO Put that folder in a better place (also inside the "for")
-	    urls_filepaths = getAssets().list(ASSETS_URL_FOLDER); 
-	    String provider_name = "";
-	    for(String url_filepath : urls_filepaths) {
-		provider_name = url_filepath.subSequence(0, url_filepath.lastIndexOf(".")).toString();
-		String provider_main_url = extractProviderMainUrlFromAssetsFile(ASSETS_URL_FOLDER + "/" + url_filepath);
-		if(getId(provider_main_url).isEmpty())
-		    ProviderListContent.addItem(new ProviderItem(provider_name, provider_main_url));
-		loaded_preseeded_providers = true;

-	    }
-	} catch (IOException e) {
-	    loaded_preseeded_providers = false;
+    
+	/**
+	 * Asks ProviderAPI to download an anonymous (anon) VPN certificate.
+	 */
+	private void downloadAnonCert() {
+		Intent provider_API_command = new Intent(this, ProviderAPI.class);
+
+		Bundle parameters = new Bundle();
+
+		parameters.putString(TYPE_OF_CERTIFICATE, ANON_CERTIFICATE);
+
+		provider_API_command.setAction(ProviderAPI.DOWNLOAD_CERTIFICATE);
+		provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);
+		provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
+
+		startService(provider_API_command);
 	}
 	
-	return loaded_preseeded_providers;
-    }
+	/**
+	 * Open the new provider dialog
+	 */
+	public void addAndSelectNewProvider() {
+	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
+	    DialogFragment newFragment = NewProviderDialog.newInstance();
+	    newFragment.show(fragment_transaction, NewProviderDialog.TAG);
+	}
+	
+	/**
+	 * Open the new provider dialog with data
+	 */
+	public void addAndSelectNewProvider(String main_url, boolean danger_on) {
+	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
+	    
+	    DialogFragment newFragment = NewProviderDialog.newInstance();
+	    Bundle data = new Bundle();
+	    data.putString(Provider.MAIN_URL, main_url);
+	    data.putBoolean(ProviderItem.DANGER_ON, danger_on);
+	    newFragment.setArguments(data);
+	    newFragment.show(fragment_transaction, NewProviderDialog.TAG);
+	}
+	
+	/**
+	 * Once selected a provider, this fragment offers the user to log in, 
+	 * use it anonymously (if possible) 
+	 * or cancel his/her election pressing the back button.
+	 * @param view
+	 * @param reason_to_fail 
+	 */
+	public void showDownloadFailedDialog(View view, String reason_to_fail) {
+	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(DownloadFailedDialog.TAG);
+		
+	    DialogFragment newFragment = DownloadFailedDialog.newInstance(reason_to_fail);
+	    newFragment.show(fragment_transaction, DownloadFailedDialog.TAG);
+	}
+	
+	/**
+	 * Once selected a provider, this fragment offers the user to log in, 
+	 * use it anonymously (if possible) 
+	 * or cancel his/her election pressing the back button.
+	 */
+	private void showProviderDetails() {
+		if(setting_up_provider) {
+		    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(ProviderDetailFragment.TAG);
 
-    private String extractProviderMainUrlFromAssetsFile(String filepath) {
-	String provider_main_url = "";
-	try {	    
-	    InputStream input_stream_file_contents = getAssets().open(filepath);
-	    byte[] urls_file_bytes = new byte[input_stream_file_contents.available()];
-	    input_stream_file_contents.read(urls_file_bytes);
-	    String urls_file_content = new String(urls_file_bytes);
-	    JSONObject file_contents = new JSONObject(urls_file_content);
-	    provider_main_url = file_contents.getString(Provider.MAIN_URL);
-	} catch (JSONException e) {
-	} catch (IOException e) {
+		    DialogFragment newFragment = ProviderDetailFragment.newInstance();
+		    newFragment.show(fragment_transaction, ProviderDetailFragment.TAG);
+		}
 	}
-	return provider_main_url;
-    }
-    
-	/**

-	 * Asks ProviderAPI to download an anonymous (anon) VPN certificate.

-	 */

-	private void downloadAnonCert() {

-		Intent provider_API_command = new Intent(this, ProviderAPI.class);

-

-		Bundle parameters = new Bundle();

-

-		parameters.putString(TYPE_OF_CERTIFICATE, ANON_CERTIFICATE);

-

-		provider_API_command.setAction(ProviderAPI.DOWNLOAD_CERTIFICATE);

-		provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);

-		provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);

-

-		startService(provider_API_command);

-	}

-	

-	/**

-	 * Open the new provider dialog

-	 */

-	public void addAndSelectNewProvider() {

-		FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();

-		Fragment previous_new_provider_dialog = getFragmentManager().findFragmentByTag(NewProviderDialog.TAG);

-		if (previous_new_provider_dialog != null) {

-			fragment_transaction.remove(previous_new_provider_dialog);

-		}

-		fragment_transaction.addToBackStack(null);

-		

-		DialogFragment newFragment = NewProviderDialog.newInstance();

-		newFragment.show(fragment_transaction, NewProviderDialog.TAG);

-	}

-	

-	/**

-	 * Open the new provider dialog with data

-	 */

-	public void addAndSelectNewProvider(String main_url, boolean danger_on) {

-		FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();

-		Fragment previous_new_provider_dialog = getFragmentManager().findFragmentByTag(NewProviderDialog.TAG);

-		if (previous_new_provider_dialog != null) {

-			fragment_transaction.remove(previous_new_provider_dialog);

-		}

-		

-		DialogFragment newFragment = NewProviderDialog.newInstance();

-		Bundle data = new Bundle();

-		data.putString(Provider.MAIN_URL, main_url);

-		data.putBoolean(ProviderItem.DANGER_ON, danger_on);

-		newFragment.setArguments(data);

-		newFragment.show(fragment_transaction, NewProviderDialog.TAG);

-	}

-	

-	/**

-	 * Once selected a provider, this fragment offers the user to log in, 

-	 * use it anonymously (if possible) 

-	 * or cancel his/her election pressing the back button.

-	 * @param view

-	 * @param reason_to_fail 

-	 */

-	public void showDownloadFailedDialog(View view, String reason_to_fail) {

-		FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();

-		Fragment previous_provider_details_dialog = getFragmentManager().findFragmentByTag(DownloadFailedDialog.TAG);

-		if (previous_provider_details_dialog != null) {

-			fragment_transaction.remove(previous_provider_details_dialog);

-		}

-		fragment_transaction.addToBackStack(null);

-		

-		DialogFragment newFragment = DownloadFailedDialog.newInstance(reason_to_fail);

-		newFragment.show(fragment_transaction, DownloadFailedDialog.TAG);

-	}

-	

-	/**

-	 * Once selected a provider, this fragment offers the user to log in, 

-	 * use it anonymously (if possible) 

-	 * or cancel his/her election pressing the back button.

-	 * @param view

-	 */

-	public void showProviderDetails(View view) {

-		if(setting_up_provider) {

-			FragmentTransaction fragment_transaction = getFragmentManager().beginTransaction();

-			Fragment previous_provider_details_dialog = getFragmentManager().findFragmentByTag(ProviderDetailFragment.TAG);

-			if (previous_provider_details_dialog != null) {

-				fragment_transaction.remove(previous_provider_details_dialog);

-			}

-			fragment_transaction.addToBackStack(null);

-

-			DialogFragment newFragment = ProviderDetailFragment.newInstance();

-			newFragment.show(fragment_transaction, ProviderDetailFragment.TAG);

-		}

-	}

-

-	public void showAndSelectProvider(String provider_main_url, boolean danger_on) {

+
+	public void showAndSelectProvider(String provider_main_url, boolean danger_on) {
 	    if(getId(provider_main_url).isEmpty())
-		showProvider(provider_main_url, danger_on);

+		showProvider(provider_main_url, danger_on);
 	    autoSelectProvider(provider_main_url, danger_on);
-	}

-	

-	private void showProvider(final String provider_main_url, final boolean danger_on) {

-		String provider_name = provider_main_url.replaceFirst("http[s]?://", "").replaceFirst("\\/", "_");

-		ProviderItem added_provider = new ProviderItem(provider_name, provider_main_url);

-		provider_list_fragment.addItem(added_provider);

-	}

-	

-	private void autoSelectProvider(String provider_main_url, boolean danger_on) {

-		preferences.edit().putBoolean(ProviderItem.DANGER_ON, danger_on).commit();

-		onItemSelected(getId(provider_main_url));

-	}

-	

-	/**

-	 * Asks ProviderAPI to download a new provider.json file

-	 * @param provider_name

-	 * @param provider_main_url

-	 * @param danger_on tells if HTTPS client should bypass certificate errors

-	 */

-	public void setUpProvider(String provider_main_url, boolean danger_on) {

-		Intent provider_API_command = new Intent(this, ProviderAPI.class);

-		Bundle parameters = new Bundle();

-		parameters.putString(Provider.MAIN_URL, provider_main_url);

-		parameters.putBoolean(ProviderItem.DANGER_ON, danger_on);

-

-		provider_API_command.setAction(ProviderAPI.SET_UP_PROVIDER);

-		provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);

+	}
+	
+	private void showProvider(final String provider_main_url, final boolean danger_on) {
+		String provider_name = provider_main_url.replaceFirst("http[s]?://", "").replaceFirst("\\/", "_");
+		ProviderItem added_provider = new ProviderItem(provider_name, provider_main_url);
+		provider_list_fragment.addItem(added_provider);
+	}
+	
+	private void autoSelectProvider(String provider_main_url, boolean danger_on) {
+		preferences.edit().putBoolean(ProviderItem.DANGER_ON, danger_on).commit();
+		onItemSelected(getId(provider_main_url));
+	}
+	
+	/**
+	 * Asks ProviderAPI to download a new provider.json file
+	 * @param provider_name
+	 * @param provider_main_url
+	 * @param danger_on tells if HTTPS client should bypass certificate errors
+	 */
+	public void setUpProvider(String provider_main_url, boolean danger_on) {
+		Intent provider_API_command = new Intent(this, ProviderAPI.class);
+		Bundle parameters = new Bundle();
+		parameters.putString(Provider.MAIN_URL, provider_main_url);
+		parameters.putBoolean(ProviderItem.DANGER_ON, danger_on);
+
+		provider_API_command.setAction(ProviderAPI.SET_UP_PROVIDER);
+		provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);
 		provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
 
-		startService(provider_API_command);

+		startService(provider_API_command);
 		setting_up_provider = true;
 	}
 
@@ -534,62 +520,62 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 			startService(provider_API_command);
 		}
 	}
-	@Override

-	public boolean onCreateOptionsMenu(Menu menu) {

-		getMenuInflater().inflate(R.menu.configuration_wizard_activity, menu);

-		return true;

-	}

-	

-	@Override

-	public boolean onOptionsItemSelected(MenuItem item){

-		switch (item.getItemId()){

+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		getMenuInflater().inflate(R.menu.configuration_wizard_activity, menu);
+		return true;
+	}
+	
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		switch (item.getItemId()){
 		case R.id.about_leap:
 		    startActivityForResult(new Intent(this, AboutActivity.class), 0);
 			return true;
-		case R.id.new_provider:

-			addAndSelectNewProvider();

-			return true;

-		default:

-			return super.onOptionsItemSelected(item);

-		}

-	}

-		

-	public void showAllProviders() {

-		provider_list_fragment = (ProviderListFragment) getFragmentManager().findFragmentByTag(ProviderListFragment.TAG);

-		if(provider_list_fragment != null)

-			provider_list_fragment.unhideAll();

-	}

-	

-	public void cancelSettingUpProvider() {

-		provider_list_fragment = (ProviderListFragment) getFragmentManager().findFragmentByTag(ProviderListFragment.TAG);

-		if(provider_list_fragment != null && preferences.contains(ProviderItem.DANGER_ON)) {

-			provider_list_fragment.removeLastItem();

-		}

-		preferences.edit().remove(Provider.KEY).remove(ProviderItem.DANGER_ON).remove(EIP.ALLOWED_ANON).remove(EIP.KEY).commit();

-	}

-

-	@Override

-	public void login() {

-		Intent ask_login = new Intent();

-		ask_login.putExtra(LogInDialog.VERB, LogInDialog.VERB);

-		setResult(RESULT_OK, ask_login);

-		setting_up_provider = false;

-		finish();

-	}

-

-	@Override

-	public void use_anonymously() {

-		setResult(RESULT_OK);

-		setting_up_provider = false;

-		finish();

-	}

-

-	public class ProviderAPIBroadcastReceiver_Update extends BroadcastReceiver {

-

-		@Override

-		public void onReceive(Context context, Intent intent) {

-			int update = intent.getIntExtra(ProviderAPI.CURRENT_PROGRESS, 0);

-			mProgressBar.setProgress(update);

-		}

-	}

-}

+		case R.id.new_provider:
+			addAndSelectNewProvider();
+			return true;
+		default:
+			return super.onOptionsItemSelected(item);
+		}
+	}
+		
+	public void showAllProviders() {
+		provider_list_fragment = (ProviderListFragment) fragment_manager.findFragmentByTag(ProviderListFragment.TAG);
+		if(provider_list_fragment != null)
+			provider_list_fragment.unhideAll();
+	}
+	
+	public void cancelSettingUpProvider() {
+		provider_list_fragment = (ProviderListFragment) fragment_manager.findFragmentByTag(ProviderListFragment.TAG);
+		if(provider_list_fragment != null && preferences.contains(ProviderItem.DANGER_ON)) {
+			provider_list_fragment.removeLastItem();
+		}
+		preferences.edit().remove(Provider.KEY).remove(ProviderItem.DANGER_ON).remove(EIP.ALLOWED_ANON).remove(EIP.KEY).commit();
+	}
+
+	@Override
+	public void login() {
+		Intent ask_login = new Intent();
+		ask_login.putExtra(LogInDialog.TAG, LogInDialog.TAG);
+		setResult(RESULT_OK, ask_login);
+		setting_up_provider = false;
+		finish();
+	}
+
+	@Override
+	public void use_anonymously() {
+		setResult(RESULT_OK);
+		setting_up_provider = false;
+		finish();
+	}
+
+	public class ProviderAPIBroadcastReceiver_Update extends BroadcastReceiver {
+
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			int update = intent.getIntExtra(ProviderAPI.CURRENT_PROGRESS, 0);
+			mProgressBar.setProgress(update);
+		}
+	}
+}
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index b83f33a1..07e0e2fe 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -93,12 +93,10 @@ public class ProviderAPI extends IntentService {
     PARAMETERS = "parameters",
     RESULT_KEY = "result",
     RECEIVER_KEY = "receiver",
-    SESSION_ID_COOKIE_KEY = "session_id_cookie_key",
-    SESSION_ID_KEY = "session_id",
     ERRORS = "errors",
     UPDATE_PROGRESSBAR = "update_progressbar",
     CURRENT_PROGRESS = "current_progress",
-    TAG = "provider_api_tag"
+	TAG = ProviderAPI.class.getSimpleName();
     ;
 
     final public static int
@@ -127,6 +125,7 @@ public class ProviderAPI extends IntentService {
     private static boolean last_danger_on = false;
     private static boolean setting_up_provider = true;
     private static SharedPreferences preferences;
+    private static String provider_api_url;
     
     public static void stop() {
     	setting_up_provider = false;
@@ -174,21 +173,21 @@ public class ProviderAPI extends IntentService {
 				}
 			}
 		} else if (action.equalsIgnoreCase(SRP_REGISTER)) {
-		    Bundle session_id_bundle = tryToRegisterWithSRP(parameters);
+		    Bundle session_id_bundle = tryToRegister(parameters);
 		    if(session_id_bundle.getBoolean(RESULT_KEY)) {
 			receiver.send(SRP_REGISTRATION_SUCCESSFUL, session_id_bundle);
 		    } else {
 			receiver.send(SRP_REGISTRATION_FAILED, session_id_bundle);
 		    }
 		} else if (action.equalsIgnoreCase(SRP_AUTH)) {
-			Bundle session_id_bundle = tryToAuthenticateBySRP(parameters);
+			Bundle session_id_bundle = tryToAuthenticate(parameters);
 				if(session_id_bundle.getBoolean(RESULT_KEY)) {
 					receiver.send(SRP_AUTHENTICATION_SUCCESSFUL, session_id_bundle);
 				} else {
 					receiver.send(SRP_AUTHENTICATION_FAILED, session_id_bundle);
 				}
 		} else if (action.equalsIgnoreCase(LOG_OUT)) {
-				if(logOut(parameters)) {
+				if(logOut()) {
 					receiver.send(LOGOUT_SUCCESSFUL, Bundle.EMPTY);
 				} else {
 					receiver.send(LOGOUT_FAILED, Bundle.EMPTY);
@@ -202,44 +201,45 @@ public class ProviderAPI extends IntentService {
 		}
 	}
 
-    private Bundle tryToRegisterWithSRP(Bundle task) {
+    private Bundle tryToRegister(Bundle task) {
 	Bundle session_id_bundle = new Bundle();
 	int progress = 0;
 		
-	String username = (String) task.get(LogInDialog.USERNAME);
-	String password = (String) task.get(LogInDialog.PASSWORD);
-	String authentication_server = (String) task.get(Provider.API_URL);
+	String username = (String) task.get(SessionDialogInterface.USERNAME);
+	String password = (String) task.get(SessionDialogInterface.PASSWORD);
+	
 	if(validUserLoginData(username, password)) {
-	    session_id_bundle = registerWithSRP(username, password, authentication_server);
+	    session_id_bundle = register(username, password);
 	    broadcast_progress(progress++);
 	} else {
 	    if(!wellFormedPassword(password)) {
 		session_id_bundle.putBoolean(RESULT_KEY, false);
-		session_id_bundle.putString(LogInDialog.USERNAME, username);
-		session_id_bundle.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
+		session_id_bundle.putString(SessionDialogInterface.USERNAME, username);
+		session_id_bundle.putBoolean(SessionDialogInterface.PASSWORD_INVALID_LENGTH, true);
 	    }
 	    if(username.isEmpty()) {
 		session_id_bundle.putBoolean(RESULT_KEY, false);
-		session_id_bundle.putBoolean(LogInDialog.USERNAME_MISSING, true);
+		session_id_bundle.putBoolean(SessionDialogInterface.USERNAME_MISSING, true);
 	    }
 	}
 		
 	return session_id_bundle;
     }
 
-    private Bundle registerWithSRP(String username, String password, String server) {	
+    private Bundle register(String username, String password) {	
 	LeapSRPSession client = new LeapSRPSession(username, password);
 	byte[] salt = client.calculateNewSalt();
 	
 	BigInteger password_verifier = client.calculateV(username, password, salt);
-	JSONObject api_result = sendNewUserDataToSRPServer(server, username, new BigInteger(1, salt).toString(16), password_verifier.toString(16));
+	
+	JSONObject api_result = sendNewUserDataToSRPServer(provider_api_url, username, new BigInteger(1, salt).toString(16), password_verifier.toString(16));
 	
 	Bundle result = new Bundle();
 	if(api_result.has(ERRORS))
 	    result = authFailedNotification(api_result, username);
 	else {
-	    result.putString(LogInDialog.USERNAME, username);
-	    result.putString(LogInDialog.PASSWORD, password);
+	    result.putString(SessionDialogInterface.USERNAME, username);
+	    result.putString(SessionDialogInterface.PASSWORD, password);
 	    result.putBoolean(RESULT_KEY, true);
 	}
 
@@ -251,26 +251,24 @@ public class ProviderAPI extends IntentService {
 	 * @param task containing: username, password and api url. 
 	 * @return a bundle with a boolean value mapped to a key named RESULT_KEY, and which is true if authentication was successful. 
 	 */
-	private Bundle tryToAuthenticateBySRP(Bundle task) {
+	private Bundle tryToAuthenticate(Bundle task) {
 	    Bundle result = new Bundle();
 	    int progress = 0;
 		
-	    String username = (String) task.get(LogInDialog.USERNAME);
-	    String password = (String) task.get(LogInDialog.PASSWORD);
-	    if(validUserLoginData(username, password)) {
-		String server = (String) task.get(Provider.API_URL);
-
-		authenticate(username, password, server);
+	    String username = (String) task.get(SessionDialogInterface.USERNAME);
+	    String password = (String) task.get(SessionDialogInterface.PASSWORD);
+	    if(validUserLoginData(username, password)) {		
+		result = authenticate(username, password);
 		broadcast_progress(progress++);
 	    } else {
 		if(!wellFormedPassword(password)) {
 		    result.putBoolean(RESULT_KEY, false);
-		    result.putString(LogInDialog.USERNAME, username);
-		    result.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
+		    result.putString(SessionDialogInterface.USERNAME, username);
+		    result.putBoolean(SessionDialogInterface.PASSWORD_INVALID_LENGTH, true);
 		}
 		if(username.isEmpty()) {
 		    result.putBoolean(RESULT_KEY, false);
-		    result.putBoolean(LogInDialog.USERNAME_MISSING, true);
+		    result.putBoolean(SessionDialogInterface.USERNAME_MISSING, true);
 		}
 	    }
 		
@@ -278,19 +276,19 @@ public class ProviderAPI extends IntentService {
 	}
 
 
-    private Bundle authenticate(String username, String password, String server) {
+    private Bundle authenticate(String username, String password) {
 	Bundle result = new Bundle();
 	
 	LeapSRPSession client = new LeapSRPSession(username, password);
 	byte[] A = client.exponential();
 	
-	JSONObject step_result = sendAToSRPServer(server, username, new BigInteger(1, A).toString(16));
+	JSONObject step_result = sendAToSRPServer(provider_api_url, username, new BigInteger(1, A).toString(16));
 	try {
 	    String salt = step_result.getString(LeapSRPSession.SALT);
 	    byte[] Bbytes = new BigInteger(step_result.getString("B"), 16).toByteArray();
 	    byte[] M1 = client.response(new BigInteger(salt, 16).toByteArray(), Bbytes);
 	    if(M1 != null) {
-		step_result = sendM1ToSRPServer(server, username, M1);
+		step_result = sendM1ToSRPServer(provider_api_url, username, M1);
 		setTokenIfAvailable(step_result);
 		byte[] M2 = new BigInteger(step_result.getString(LeapSRPSession.M2), 16).toByteArray();
 		if(client.verify(M2)) {
@@ -300,7 +298,7 @@ public class ProviderAPI extends IntentService {
 		}
 	    } else {
 		result.putBoolean(RESULT_KEY, false);
-		result.putString(LogInDialog.USERNAME, username);
+		result.putString(SessionDialogInterface.USERNAME, username);
 		result.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_srp_math_error_user_message));
 	    }
 	} catch (JSONException e) {
@@ -331,7 +329,7 @@ public class ProviderAPI extends IntentService {
 	} catch(JSONException e) {}
 	
 	if(!username.isEmpty())
-	    user_notification_bundle.putString(LogInDialog.USERNAME, username);
+	    user_notification_bundle.putString(SessionDialogInterface.USERNAME, username);
 	user_notification_bundle.putBoolean(RESULT_KEY, false);
 
 	return user_notification_bundle;
@@ -619,6 +617,7 @@ public class ProviderAPI extends IntentService {
 
 			try {
 				JSONObject provider_json = new JSONObject(provider_dot_json_string);
+				provider_api_url = provider_json.getString(Provider.API_URL) + "/" + provider_json.getString(Provider.API_VERSION);
 				String name = provider_json.getString(Provider.NAME);
 				//TODO setProviderName(name);
 
@@ -860,51 +859,50 @@ public class ProviderAPI extends IntentService {
 	 * @param task containing api url from which the user will log out
 	 * @return true if there were no exceptions
 	 */
-	private boolean logOut(Bundle task) {
-		try {
-			String delete_url = task.getString(Provider.API_URL) + "/logout";
-			int progress = 0;
+    private boolean logOut() {
+	try {
+	    String delete_url = provider_api_url + "/logout";
+	    int progress = 0;
 
-			HttpsURLConnection urlConnection = (HttpsURLConnection)new URL(delete_url).openConnection();
-			urlConnection.setRequestMethod("DELETE");
-			urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
+	    HttpsURLConnection urlConnection = (HttpsURLConnection)new URL(delete_url).openConnection();
+	    urlConnection.setRequestMethod("DELETE");
+	    urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
 
-			int responseCode = urlConnection.getResponseCode();
-			broadcast_progress(progress++);
-			LeapSRPSession.setToken("");
-			Log.d(TAG, Integer.toString(responseCode));
-		} catch (ClientProtocolException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return false;
-		} catch (IndexOutOfBoundsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return false;
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return false;
-		} catch (KeyManagementException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (KeyStoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (NoSuchAlgorithmException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (CertificateException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return true;
+	    int responseCode = urlConnection.getResponseCode();
+	    broadcast_progress(progress++);
+	    LeapSRPSession.setToken("");
+	    Log.d(TAG, Integer.toString(responseCode));
+	} catch (ClientProtocolException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	    return false;
+	} catch (IndexOutOfBoundsException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	    return false;
+	} catch (IOException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	    return false;
+	} catch (KeyManagementException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	} catch (KeyStoreException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	} catch (NoSuchAlgorithmException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	} catch (CertificateException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
 	}
+	return true;
+    }
 
     private boolean updateVpnCertificate() {
 	getNewCert();
 
-	preferences.edit().putInt(EIP.PARSED_SERIAL, 0).commit();
 	Intent updateEIP = new Intent(getApplicationContext(), EIP.class);
 	updateEIP.setAction(EIP.ACTION_UPDATE_EIP_SERVICE);
 	startService(updateEIP);