Bug in the add provider to the adapter fixed.

Refactored the new provider dialog too.

5 files changed, 100 insertions, 102 deletions

diff --git a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
index 63185d12..ac2e00b8 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -333,8 +333,7 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 	 */
 	public void addAndSelectNewProvider() {
 	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
-	    DialogFragment newFragment = NewProviderDialog.newInstance();
-	    newFragment.show(fragment_transaction, NewProviderDialog.TAG);
+        new NewProviderDialog().show(fragment_transaction, NewProviderDialog.TAG);
 	}
 	
 	/**
@@ -343,7 +342,7 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 	public void addAndSelectNewProvider(String main_url, boolean danger_on) {
 	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
 	    
-	    DialogFragment newFragment = NewProviderDialog.newInstance();
+	    DialogFragment newFragment = new NewProviderDialog();
 	    Bundle data = new Bundle();
 	    data.putString(Provider.MAIN_URL, main_url);
 	    data.putBoolean(ProviderItem.DANGER_ON, danger_on);
diff --git a/app/src/debug/java/se/leap/bitmaskclient/NewProviderDialog.java b/app/src/debug/java/se/leap/bitmaskclient/NewProviderDialog.java
index cf09c64b..8fe1c3eb 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/NewProviderDialog.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/NewProviderDialog.java
@@ -16,14 +16,14 @@
  */
  package se.leap.bitmaskclient;
 
+import butterknife.ButterKnife;
+import butterknife.InjectView;
 import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
-import se.leap.bitmaskclient.R;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -40,20 +40,17 @@ import android.widget.Toast;
 public class NewProviderDialog extends DialogFragment {
 
     final public static String TAG = "newProviderDialog";
-        
+
+    @InjectView(R.id.new_provider_url)
+    EditText url_input_field;
+    @InjectView(R.id.danger_checkbox)
+    CheckBox danger_checkbox;
+
 	public interface NewProviderDialogInterface {
         public void showAndSelectProvider(String url_provider, boolean danger_on);
     }
 
 	NewProviderDialogInterface interface_with_ConfigurationWizard;
-
-	/**
-	 * @return a new instance of this DialogFragment.
-	 */
-	public static DialogFragment newInstance() {
-		NewProviderDialog dialog_fragment = new NewProviderDialog();
-		return dialog_fragment;
-	}
 	
     @Override
     public void onAttach(Activity activity) {
@@ -70,36 +67,19 @@ public class NewProviderDialog extends DialogFragment {
 	public Dialog onCreateDialog(Bundle savedInstanceState) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 		LayoutInflater inflater = getActivity().getLayoutInflater();
-		View new_provider_dialog_view = inflater.inflate(R.layout.new_provider_dialog, null);
-		final EditText url_input_field = (EditText)new_provider_dialog_view.findViewById(R.id.new_provider_url);
-		if(getArguments() != null && getArguments().containsKey(Provider.MAIN_URL)) {
-			url_input_field.setText(getArguments().getString(Provider.MAIN_URL));
-		}
-		final CheckBox danger_checkbox = (CheckBox)new_provider_dialog_view.findViewById(R.id.danger_checkbox);
-		if(getArguments() != null && getArguments().containsKey(ProviderItem.DANGER_ON)) {
-			danger_checkbox.setActivated(getArguments().getBoolean(ProviderItem.DANGER_ON));
-		}
+		View view = inflater.inflate(R.layout.new_provider_dialog, null);
+        ButterKnife.inject(this, view);
+        Bundle arguments = getArguments();
+		if(arguments != null) {
+            url_input_field.setText(arguments.getString(Provider.MAIN_URL, ""));
+            danger_checkbox.setActivated(arguments.getBoolean(ProviderItem.DANGER_ON, false));
+        }
 		
-		builder.setView(new_provider_dialog_view)
+		builder.setView(view)
 			.setMessage(R.string.introduce_new_provider)
 			.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
 				public void onClick(DialogInterface dialog, int id) {
-					String entered_url = url_input_field.getText().toString().trim();
-					if(!entered_url.startsWith("https://")) {
-						if (entered_url.startsWith("http://")){
-							entered_url = entered_url.substring("http://".length());
-						}
-						entered_url = "https://".concat(entered_url);
-					}
-					boolean danger_on = danger_checkbox.isChecked();
-					if(validURL(entered_url)) {
-						interface_with_ConfigurationWizard.showAndSelectProvider(entered_url, danger_on);
-						Toast.makeText(getActivity().getApplicationContext(), R.string.valid_url_entered, Toast.LENGTH_LONG).show();
-					} else {
-						url_input_field.setText("");
-						danger_checkbox.setChecked(false);
-						Toast.makeText(getActivity().getApplicationContext(), R.string.not_valid_url_entered, Toast.LENGTH_LONG).show();;
-					}
+                    saveProvider();
 				}
 			})
 			.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
@@ -111,6 +91,25 @@ public class NewProviderDialog extends DialogFragment {
 		return builder.create();
 	}
 
+    private void saveProvider() {
+        String entered_url = url_input_field.getText().toString().trim();
+        if(!entered_url.startsWith("https://")) {
+            if (entered_url.startsWith("http://")){
+                entered_url = entered_url.substring("http://".length());
+            }
+            entered_url = "https://".concat(entered_url);
+        }
+        boolean danger_on = danger_checkbox.isChecked();
+        if(validURL(entered_url)) {
+            interface_with_ConfigurationWizard.showAndSelectProvider(entered_url, danger_on);
+            Toast.makeText(getActivity().getApplicationContext(), R.string.valid_url_entered, Toast.LENGTH_LONG).show();
+        } else {
+            url_input_field.setText("");
+            danger_checkbox.setChecked(false);
+            Toast.makeText(getActivity().getApplicationContext(), R.string.not_valid_url_entered, Toast.LENGTH_LONG).show();;
+        }
+    }
+
     /**
      * Checks if the entered url is valid or not.
      * @param entered_url
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListAdapter.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListAdapter.java
index 19a9a089..c63e2edb 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListAdapter.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListAdapter.java
@@ -90,7 +90,7 @@ public class ProviderListAdapter extends RendererAdapter<Provider> {
 	@Override
 	public void add(Provider item) {
 		super.add(item);
-        if(getCollection().size() < hidden.length) {
+        if(getCollection().size() >  hidden.length) {
             boolean[] new_hidden = new boolean[hidden.length + 1];
             System.arraycopy(hidden, 0, new_hidden, 0, hidden.length);
             new_hidden[hidden.length] = false;
diff --git a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
index c90ce481..73de29bc 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -331,8 +331,7 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 	 */
 	public void addAndSelectNewProvider() {
 	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
-	    DialogFragment newFragment = NewProviderDialog.newInstance();
-	    newFragment.show(fragment_transaction, NewProviderDialog.TAG);
+        new NewProviderDialog().show(fragment_transaction, NewProviderDialog.TAG);
 	}
 	
 	/**
@@ -341,7 +340,7 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
 	public void addAndSelectNewProvider(String main_url) {
 	    FragmentTransaction fragment_transaction = fragment_manager.removePreviousFragment(NewProviderDialog.TAG);
 		
-	    DialogFragment newFragment = NewProviderDialog.newInstance();
+	    DialogFragment newFragment = new NewProviderDialog();
 	    Bundle data = new Bundle();
 	    data.putString(Provider.MAIN_URL, main_url);
 	    newFragment.setArguments(data);
diff --git a/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java b/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java
index 7ed1940e..f6709c22 100644
--- a/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java
+++ b/app/src/release/java/se/leap/bitmaskclient/NewProviderDialog.java
@@ -1,6 +1,6 @@
 /**
  * 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
@@ -14,16 +14,16 @@
  * 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;
+package se.leap.bitmaskclient;
 
+import butterknife.ButterKnife;
+import butterknife.InjectView;
 import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
-import se.leap.bitmaskclient.R;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,33 +33,28 @@ import android.widget.Toast;
 
 /**
  * Implements the new custom provider dialog.
- * 
+ *
  * @author parmegv
  *
  */
 public class NewProviderDialog extends DialogFragment {
 
     final public static String TAG = "newProviderDialog";
-        
-	public interface NewProviderDialogInterface {
+
+    @InjectView(R.id.new_provider_url)
+    EditText url_input_field;
+
+    public interface NewProviderDialogInterface {
         public void showAndSelectProvider(String url_provider);
     }
 
-	NewProviderDialogInterface interface_with_ConfigurationWizard;
+    NewProviderDialogInterface interface_with_ConfigurationWizard;
 
-	/**
-	 * @return a new instance of this DialogFragment.
-	 */
-	public static DialogFragment newInstance() {
-		NewProviderDialog dialog_fragment = new NewProviderDialog();
-		return dialog_fragment;
-	}
-	
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
         try {
-        	interface_with_ConfigurationWizard = (NewProviderDialogInterface) activity;
+            interface_with_ConfigurationWizard = (NewProviderDialogInterface) activity;
         } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString()
                     + " must implement NoticeDialogListener");
@@ -67,51 +62,57 @@ public class NewProviderDialog extends DialogFragment {
     }
 
     @Override
-	public Dialog onCreateDialog(Bundle savedInstanceState) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-		LayoutInflater inflater = getActivity().getLayoutInflater();
-		View new_provider_dialog_view = inflater.inflate(R.layout.new_provider_dialog, null);
-		final EditText url_input_field = (EditText)new_provider_dialog_view.findViewById(R.id.new_provider_url);
-		if(getArguments() != null && getArguments().containsKey(Provider.MAIN_URL)) {
-			url_input_field.setText(getArguments().getString(Provider.MAIN_URL));
-		}
-		
-		builder.setView(new_provider_dialog_view)
-			.setMessage(R.string.introduce_new_provider)
-			.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int id) {
-					String entered_url = url_input_field.getText().toString().trim();
-					if(!entered_url.startsWith("https://")) {
-						if (entered_url.startsWith("http://")){
-							entered_url = entered_url.substring("http://".length());
-						}
-						entered_url = "https://".concat(entered_url);
-					}
-					if(validURL(entered_url)) {
-						interface_with_ConfigurationWizard.showAndSelectProvider(entered_url);
-						Toast.makeText(getActivity().getApplicationContext(), R.string.valid_url_entered, Toast.LENGTH_LONG).show();
-					} else {
-						url_input_field.setText("");
-						Toast.makeText(getActivity().getApplicationContext(), R.string.not_valid_url_entered, Toast.LENGTH_LONG).show();;
-					}
-				}
-			})
-			.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int id) {
-					dialog.cancel();
-				}
-			});
-		// Create the AlertDialog object and return it
-		return builder.create();
-	}
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.new_provider_dialog, null);
+        ButterKnife.inject(this, view);
+        Bundle arguments = getArguments();
+        if(arguments != null) {
+            url_input_field.setText(arguments.getString(Provider.MAIN_URL, ""));
+        }
+
+        builder.setView(view)
+                .setMessage(R.string.introduce_new_provider)
+                .setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        saveProvider();
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        dialog.cancel();
+                    }
+                });
+        // Create the AlertDialog object and return it
+        return builder.create();
+    }
+
+    private void saveProvider() {
+        String entered_url = url_input_field.getText().toString().trim();
+        if(!entered_url.startsWith("https://")) {
+            if (entered_url.startsWith("http://")){
+                entered_url = entered_url.substring("http://".length());
+            }
+            entered_url = "https://".concat(entered_url);
+        }
+
+        if(validURL(entered_url)) {
+            interface_with_ConfigurationWizard.showAndSelectProvider(entered_url);
+            Toast.makeText(getActivity().getApplicationContext(), R.string.valid_url_entered, Toast.LENGTH_LONG).show();
+        } else {
+            url_input_field.setText("");
+            Toast.makeText(getActivity().getApplicationContext(), R.string.not_valid_url_entered, Toast.LENGTH_LONG).show();;
+        }
+    }
 
     /**
      * Checks if the entered url is valid or not.
      * @param entered_url
      * @return true if it's not empty nor contains only the protocol.
      */
-	boolean validURL(String entered_url) {
-		//return !entered_url.isEmpty() && entered_url.matches("http[s]?://.+") && !entered_url.replaceFirst("http[s]?://", "").isEmpty();
-		return android.util.Patterns.WEB_URL.matcher(entered_url).matches();
-	}
+    boolean validURL(String entered_url) {
+        //return !entered_url.isEmpty() && entered_url.matches("http[s]?://.+") && !entered_url.replaceFirst("http[s]?://", "").isEmpty();
+        return android.util.Patterns.WEB_URL.matcher(entered_url).matches();
+    }
 }