Merge branch 'bug/Release-ConfigurationWizard-differs-from-debug's-#6633' into bug/ButterKnife-doesn't-find-provider_list_view-#6581

2 files changed, 190 insertions, 180 deletions

diff --git a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
index ac2e00b8..f180b444 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -29,8 +29,7 @@ import java.util.*;
 
 import butterknife.*;
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.*;
 
 import javax.inject.Inject;
 
@@ -59,16 +58,16 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
     @Inject ProviderListAdapter adapter;
 
     private ProviderManager provider_manager;
-	private Intent mConfigState = new Intent();
+    private Intent mConfigState = new Intent();
     private Provider selected_provider;
 	
-	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 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 PROVIDER_SET = "PROVIDER SET";
+    final protected static String SERVICES_RETRIEVED = "SERVICES RETRIEVED";
 
     final private static String PROGRESSBAR_TEXT = TAG + "PROGRESSBAR_TEXT";
     final private static String PROGRESSBAR_NUMBER = TAG + "PROGRESSBAR_NUMBER";
@@ -112,13 +111,12 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 
         setUpInitialUI();
 
-        setUpProviderAPIResultReceiver();
+	initProviderList();
 
-        setUpProviderList();
-
-        if(savedInstanceState != null) {
+        if(savedInstanceState != null)
             restoreState(savedInstanceState);
-        }
+	else
+	    setUpProviderAPIResultReceiver();
     }
 
     private void restoreState(Bundle savedInstanceState) {
@@ -135,7 +133,6 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
         super.onPostResume();
         if(!progressbar_text.isEmpty() && !provider_name.isEmpty() && progress != -1) {
             progressbar_description.setText(progressbar_text);
-            //onItemSelectedUi(getProvider(provider_name));
             mProgressBar.setProgress(progress);
 
             progressbar_text = "";
@@ -156,10 +153,6 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 	progressbar_description.setVisibility(TextView.INVISIBLE);
     }
 
-    private void setUpProviderList() {
-        initProviderList();
-    }
-
     @Override
     protected void onDestroy() {
 	super.onDestroy();
@@ -249,8 +242,6 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
         adapter.hideAllBut(adapter.indexOf(provider));
     }
     
-    
-    
     @Override
     public void onBackPressed() {
     	if(setting_up_provider) {
@@ -271,15 +262,15 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
     }
 
     public void cancelSettingUpProvider() {
-        showAllProviders();
+        adapter.showAllProviders();
         setting_up_provider = false;
         preferences.edit().remove(Provider.KEY).remove(ProviderItem.DANGER_ON).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).commit();
     }
     
     private void askDashboardToQuitApp() {
-		Intent ask_quit = new Intent();
-		ask_quit.putExtra(Dashboard.ACTION_QUIT, Dashboard.ACTION_QUIT);
-		setResult(RESULT_CANCELED, ask_quit);
+	Intent ask_quit = new Intent();
+	ask_quit.putExtra(Dashboard.ACTION_QUIT, Dashboard.ACTION_QUIT);
+	setResult(RESULT_CANCELED, ask_quit);
     }
 
     private void startProgressBar() {
@@ -296,86 +287,86 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
     private int listItemHeight() {
         View listItem = adapter.getView(0, null, provider_list_view);
         listItem.setLayoutParams(new RelativeLayout.LayoutParams(
-                    RelativeLayout.LayoutParams.WRAP_CONTENT,
-                    RelativeLayout.LayoutParams.WRAP_CONTENT));
+								 RelativeLayout.LayoutParams.WRAP_CONTENT,
+								 RelativeLayout.LayoutParams.WRAP_CONTENT));
         WindowManager wm = (WindowManager) getApplicationContext()
-                    .getSystemService(Context.WINDOW_SERVICE);
+	    .getSystemService(Context.WINDOW_SERVICE);
         Display display = wm.getDefaultDisplay();
         int screenWidth = display.getWidth(); // deprecated
 
         int listViewWidth = screenWidth - 10 - 10;
         int widthSpec = View.MeasureSpec.makeMeasureSpec(listViewWidth,
-                    View.MeasureSpec.AT_MOST);
+							 View.MeasureSpec.AT_MOST);
         listItem.measure(widthSpec, 0);
 
         return listItem.getMeasuredHeight();
-}
+    }
     
-	/**
-	 * Asks ProviderAPI to download an anonymous (anon) VPN certificate.
-	 */
-	private void downloadAnonCert() {
-		Intent provider_API_command = new Intent(this, ProviderAPI.class);
+    /**
+     * 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();
+	Bundle parameters = new Bundle();
 
-		parameters.putString(TYPE_OF_CERTIFICATE, ANON_CERTIFICATE);
+	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);
+	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);
-	}
+	startService(provider_API_command);
+    }
 	
-	/**
-	 * Open the new provider dialog
-	 */
-	public void addAndSelectNewProvider() {
-	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
+    /**
+     * Open the new provider dialog
+     */
+    public void addAndSelectNewProvider() {
+	FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
         new NewProviderDialog().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);
+    /**
+     * 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 = new NewProviderDialog();
-	    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);
-	}
+	DialogFragment newFragment = new NewProviderDialog();
+	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 reason_to_fail
-	 */
-	public void showDownloadFailedDialog(String reason_to_fail) {
-	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(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 reason_to_fail
+     */
+    public void showDownloadFailedDialog(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);
-	}
+	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);
-
-		    DialogFragment newFragment = ProviderDetailFragment.newInstance();
-		    newFragment.show(fragment_transaction, ProviderDetailFragment.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);
+
+	    DialogFragment newFragment = ProviderDetailFragment.newInstance();
+	    newFragment.show(fragment_transaction, ProviderDetailFragment.TAG);
 	}
+    }
 
     public void showAndSelectProvider(String provider_main_url, boolean danger_on) {
         try {
@@ -395,87 +386,82 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
         onItemSelectedUi(selected_provider);
     }
 	
-	/**
-	 * Asks ProviderAPI to download a new provider.json file
-n	 * @param provider_main_url
-	 * @param danger_on tells if HTTPS client should bypass certificate errors
-	 */
-	public void setUpProvider(URL 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.toString());
-		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);
-		setting_up_provider = true;
-	}
+    /**
+     * Asks ProviderAPI to download a new provider.json file
+     * @param provider_main_url
+     * @param danger_on tells if HTTPS client should bypass certificate errors
+     */
+    public void setUpProvider(URL 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.toString());
+	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);
+	setting_up_provider = true;
+    }
 
-	public void retrySetUpProvider() {
-		cancelSettingUpProvider();
-		if(!ProviderAPI.caCertDownloaded()) {
-			addAndSelectNewProvider(ProviderAPI.lastProviderMainUrl(), ProviderAPI.lastDangerOn());
-		} else {
-			Intent provider_API_command = new Intent(this, ProviderAPI.class);
+    public void retrySetUpProvider() {
+	cancelSettingUpProvider();
+	if(!ProviderAPI.caCertDownloaded()) {
+	    addAndSelectNewProvider(ProviderAPI.lastProviderMainUrl(), ProviderAPI.lastDangerOn());
+	} else {
+	    Intent provider_API_command = new Intent(this, ProviderAPI.class);
 
-			provider_API_command.setAction(ProviderAPI.SET_UP_PROVIDER);
-			provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
+	    provider_API_command.setAction(ProviderAPI.SET_UP_PROVIDER);
+	    provider_API_command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
 
-			startService(provider_API_command);
-		}
-	}
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.configuration_wizard_activity, menu);
-		return true;
+	    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()){
-		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);
-		}
+    @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() {
-        adapter.showAllProviders();
-	}
-
-	@Override
-	public void login() {
-		Intent ask_login = new Intent();
-		ask_login.putExtra(SessionDialog.TAG, SessionDialog.TAG);
+    @Override
+    public void login() {
+	Intent ask_login = new Intent();
+	ask_login.putExtra(SessionDialog.TAG, SessionDialog.TAG);
         ask_login.putExtra(Provider.KEY, selected_provider);
-		setResult(RESULT_OK, ask_login);
-		setting_up_provider = false;
-		finish();
-	}
+	setResult(RESULT_OK, ask_login);
+	setting_up_provider = false;
+	finish();
+    }
 
-	@Override
-	public void use_anonymously() {
+    @Override
+    public void use_anonymously() {
         Intent pass_provider = new Intent();
         pass_provider.putExtra(Provider.KEY, selected_provider);
-		setResult(RESULT_OK, pass_provider);
-		setting_up_provider = false;
-		finish();
-	}
-
-	public class ProviderAPIBroadcastReceiver_Update extends BroadcastReceiver {
+	setResult(RESULT_OK, pass_provider);
+	setting_up_provider = false;
+	finish();
+    }
 
-		@Override
-		public void onReceive(Context context, Intent intent) {
-			int update = intent.getIntExtra(ProviderAPI.CURRENT_PROGRESS, 0);
-			mProgressBar.setProgress(update);
-		}
+    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 886d70a0..d63d641a 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -232,8 +232,8 @@ public class ProviderAPI extends IntentService {
 	    Bundle result = new Bundle();
 	    int progress = 0;
 		
-	    String username = (String) task.get(SessionDialog.USERNAME);
-	    String password = (String) task.get(SessionDialog.PASSWORD);
+	    String username = task.getString(SessionDialog.USERNAME);
+	    String password = task.getString(SessionDialog.PASSWORD);
 	    if(validUserLoginData(username, password)) {		
 		result = authenticate(username, password);
 		broadcast_progress(progress++);
@@ -243,7 +243,7 @@ public class ProviderAPI extends IntentService {
 		    result.putString(SessionDialog.USERNAME, username);
 		    result.putBoolean(SessionDialog.PASSWORD_INVALID_LENGTH, true);
 		}
-		if(username.isEmpty()) {
+		if(!validUsername(username)) {
 		    result.putBoolean(RESULT_KEY, false);
 		    result.putBoolean(SessionDialog.USERNAME_MISSING, true);
 		}
@@ -327,21 +327,25 @@ public class ProviderAPI extends IntentService {
 
 	/**
 	 * Validates parameters entered by the user to log in
-	 * @param entered_username
-	 * @param entered_password
+	 * @param username
+	 * @param password
 	 * @return true if both parameters are present and the entered password length is greater or equal to eight (8).
 	 */
-	private boolean validUserLoginData(String entered_username, String entered_password) {
-		return !(entered_username.isEmpty()) && wellFormedPassword(entered_password);
+	private boolean validUserLoginData(String username, String password) {
+		return validUsername(username) && wellFormedPassword(password);
 	}
 
+    private boolean validUsername(String username) {
+        return username != null && !username.isEmpty();
+    }
+
 	/**
 	 * Validates a password
-	 * @param entered_password
+	 * @param password
 	 * @return true if the entered password length is greater or equal to eight (8).
 	 */
-	private boolean wellFormedPassword(String entered_password) {
-		return entered_password.length() >= 8;
+	private boolean wellFormedPassword(String password) {
+		return password != null && password.length() >= 8;
 	}
 
 	/**
@@ -554,15 +558,18 @@ public class ProviderAPI extends IntentService {
 	if(!ConfigHelper.checkErroneousDownload(cert_string)) {
 	    X509Certificate certificate = ConfigHelper.parseX509CertificateFromString(cert_string);
 	    try {
-		JSONObject provider_json = new JSONObject(preferences.getString(Provider.KEY, ""));
-		String fingerprint = provider_json.getString(Provider.CA_CERT_FINGERPRINT);
-		String encoding = fingerprint.split(":")[0];
-		String expected_fingerprint = fingerprint.split(":")[1];
-		String real_fingerprint = base64toHex(Base64.encodeToString(
-									    MessageDigest.getInstance(encoding).digest(certificate.getEncoded()),
-									    Base64.DEFAULT));
-
-		result = real_fingerprint.trim().equalsIgnoreCase(expected_fingerprint.trim());
+		if(certificate != null) {
+		    JSONObject provider_json = new JSONObject(preferences.getString(Provider.KEY, ""));
+		    String fingerprint = provider_json.getString(Provider.CA_CERT_FINGERPRINT);
+		    String encoding = fingerprint.split(":")[0];
+		    String expected_fingerprint = fingerprint.split(":")[1];
+		    String real_fingerprint = base64toHex(Base64.encodeToString(
+										MessageDigest.getInstance(encoding).digest(certificate.getEncoded()),
+										Base64.DEFAULT));
+
+		    result = real_fingerprint.trim().equalsIgnoreCase(expected_fingerprint.trim());
+		} else
+		    result = false;
 	    } catch (JSONException e) {
 		result = false;
 	    } catch (NoSuchAlgorithmException e) {
@@ -823,20 +830,23 @@ public class ProviderAPI extends IntentService {
 		return string;
 	}
 	
-	/**
-	 * Logs out from the api url retrieved from the task.
-	 * @return true if there were no exceptions
-	 */
+    /**
+     * Logs out from the api url retrieved from the task.
+     * @return true if there were no exceptions
+     */
     private boolean logOut() {
+        String delete_url = provider_api_url + "/logout";
+
+        HttpsURLConnection urlConnection = null;
+        int responseCode = 0;
+        int progress = 0;
 	try {
-	    String delete_url = provider_api_url + "/logout";
-	    int progress = 0;
 
-	    HttpsURLConnection urlConnection = (HttpsURLConnection)new URL(delete_url).openConnection();
+	    urlConnection = (HttpsURLConnection)new URL(delete_url).openConnection();
 	    urlConnection.setRequestMethod("DELETE");
 	    urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
 
-	    int responseCode = urlConnection.getResponseCode();
+	    responseCode = urlConnection.getResponseCode();
 	    broadcast_progress(progress++);
 	    LeapSRPSession.setToken("");
 	    Log.d(TAG, Integer.toString(responseCode));
@@ -850,6 +860,20 @@ public class ProviderAPI extends IntentService {
 	    return false;
 	} catch (IOException e) {
 	    // TODO Auto-generated catch block
+	    try {
+		if(urlConnection != null) {
+		    responseCode = urlConnection.getResponseCode();
+		    if(responseCode == 401) {
+			broadcast_progress(progress++);
+			LeapSRPSession.setToken("");
+			Log.d(TAG, Integer.toString(responseCode));
+			return true;
+		    }
+		}
+	    } catch (IOException e1) {
+		e1.printStackTrace();
+	    }
+
 	    e.printStackTrace();
 	    return false;
 	} catch (KeyManagementException e) {