Don't allow duplicate domains to be created in domain settings. Implements https...

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java
index 9e63a9405207a97bfbdb9fe48b305af0736dc094..396e920d378639a636ee02ba42828f0a143ef01e 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java
@@ -29,13 +29,18 @@ import android.os.Bundle;
 // We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <= 22.
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatDialogFragment;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.activities.MainWebViewActivity;
+import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper;
 
 public class AddDomainDialog extends AppCompatDialogFragment {
     // The public interface is used to send information back to the parent activity.
@@ -105,11 +110,46 @@ public class AddDomainDialog extends AppCompatDialogFragment {
         // Show the keyboard when the `AlertDialog` is displayed on the screen.
         alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
 
-        // We need to show the `AlertDialog` before we can edit the contents.
+        // The `AlertDialog` must be shown before the contents can be edited.
         alertDialog.show();
 
-        // Get a handle for `domain_name_edittext`.
-        EditText addDomainEditText = (EditText) alertDialog.findViewById(R.id.domain_name_edittext);
+        // Initialize `domainsDatabaseHelper`.  The two `nulls` do not specify the database name or a `CursorFactory`.  The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`.
+        final DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(getContext(), null, null, 0);
+
+        // Get handles for the views in `alertDialog`.
+        final EditText addDomainEditText = (EditText) alertDialog.findViewById(R.id.domain_name_edittext);
+        final TextView domainNameAlreadyExistsTextView = (TextView) alertDialog.findViewById(R.id.domain_name_already_exists_textview);
+        final Button addButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+
+        //  Update the status of the warning text and the `add` button.
+        addDomainEditText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                // Do nothing.
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                // Do nothing.
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (domainsDatabaseHelper.getCursorForDomainName(addDomainEditText.getText().toString()).getCount() >0) {  // The domain already exists.
+                    // Show the warning text.
+                    domainNameAlreadyExistsTextView.setVisibility(View.VISIBLE);
+
+                    // Disable the `add` button.
+                    addButton.setEnabled(false);
+                } else {  // The domain do not yet exist.
+                    // Hide the warning text.
+                    domainNameAlreadyExistsTextView.setVisibility(View.GONE);
+
+                    // Enable the `add` button.
+                    addButton.setEnabled(true);
+                }
+            }
+        });
 
         // Get the current domain from `formattedUrlString`.
         Uri currentUri = Uri.parse(MainWebViewActivity.formattedUrlString);

diff --git a/app/src/main/res/layout/add_domain_dialog.xml b/app/src/main/res/layout/add_domain_dialog.xml
index 82f24dff95c76fd73bec492924cfe69156bfad9e..176c542e9ac31587631977a70752a8532b7370e6 100644 (file)
--- a/app/src/main/res/layout/add_domain_dialog.xml
+++ b/app/src/main/res/layout/add_domain_dialog.xml
@@ -29,7 +29,6 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp" >
 
@@ -43,4 +42,14 @@
             android:inputType="textUri"
             android:selectAllOnFocus="true" />
     </android.support.design.widget.TextInputLayout>
+
+    <TextView
+        android:id="@+id/domain_name_already_exists_textview"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:text="@string/domain_name_already_exists"
+        android:textColor="?attr/redText"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="12dp" />
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 359cc97edbbdafb93872ea090dc6a913b9649f05..c825d38af619d5fad9787ff5324aeb510e62f0d7 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -190,6 +190,7 @@
     <string name="domains">Domains</string>
     <string name="domain_settings">Domain Settings</string>
     <string name="add_domain">Add Domain</string>
+    <string name="domain_name_already_exists">Domain name already exists</string>
     <string name="add">Add</string>
     <string name="domain_name">Domain name</string>
     <string name="domain_settings_saved">Domain settings saved</string>