Merge pull request #1387 from ishit/master

Add visual element to verify the re-typed password. Refer #1357.

10 files changed, 43 insertions, 15 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
index 3379e0a6d..b38d874d8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
@@ -21,6 +21,8 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.text.method.HideReturnsTransformationMethod;
 import android.text.method.PasswordTransformationMethod;
 import android.view.LayoutInflater;
@@ -79,19 +81,10 @@ public class CreateKeyPassphraseFragment extends Fragment {
         return output;
     }
 
-    private static boolean areEditTextsEqual(Context context, EditText editText1, EditText editText2) {
+    private static boolean areEditTextsEqual(EditText editText1, EditText editText2) {
         Passphrase p1 = new Passphrase(editText1);
         Passphrase p2 = new Passphrase(editText2);
-        boolean output = (p1.equals(p2));
-
-        if (!output) {
-            editText2.setError(context.getString(R.string.create_key_passphrases_not_equal));
-            editText2.requestFocus();
-        } else {
-            editText2.setError(null);
-        }
-
-        return output;
+        return (p1.equals(p2));
     }
 
     @Override
@@ -137,6 +130,35 @@ public class CreateKeyPassphraseFragment extends Fragment {
             }
         });
 
+        TextWatcher textWatcher = new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (!isEditTextNotEmpty(getActivity(), mPassphraseEdit)) {
+                    mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+                    return;
+                }
+
+                if (areEditTextsEqual(mPassphraseEdit, mPassphraseEditAgain)) {
+                    mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_stat_retyped_ok, 0);
+                } else {
+                    mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_stat_retyped_bad, 0);
+                }
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        };
+
+        mPassphraseEdit.addTextChangedListener(textWatcher);
+        mPassphraseEditAgain.addTextChangedListener(textWatcher);
 
         return view;
     }
@@ -153,9 +175,15 @@ public class CreateKeyPassphraseFragment extends Fragment {
     }
 
     private void nextClicked() {
-        if (isEditTextNotEmpty(getActivity(), mPassphraseEdit)
-                && areEditTextsEqual(getActivity(), mPassphraseEdit, mPassphraseEditAgain)) {
+        if (isEditTextNotEmpty(getActivity(), mPassphraseEdit)) {
+
+            if (!areEditTextsEqual(mPassphraseEdit, mPassphraseEditAgain)) {
+                mPassphraseEditAgain.setError(getActivity().getApplicationContext().getString(R.string.create_key_passphrases_not_equal));
+                mPassphraseEditAgain.requestFocus();
+                return;
+            }
 
+            mPassphraseEditAgain.setError(null);
             // save state
             mCreateKeyActivity.mPassphrase = new Passphrase(mPassphraseEdit);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java
index e55f6b1ad..494ccb6d3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java
@@ -75,10 +75,10 @@ public class EmailEditText extends AppCompatAutoCompleteTextView {
                 Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email);
                 if (emailMatcher.matches()) {
                     EmailEditText.this.setCompoundDrawablesWithIntrinsicBounds(0, 0,
-                            R.drawable.uid_mail_ok, 0);
+                            R.drawable.ic_stat_retyped_ok, 0);
                 } else {
                     EmailEditText.this.setCompoundDrawablesWithIntrinsicBounds(0, 0,
-                            R.drawable.uid_mail_bad, 0);
+                            R.drawable.ic_stat_retyped_bad, 0);
                 }
             } else {
                 // remove drawable if email is empty
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png
index dc20b0f03..dc20b0f03 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png
index 76944469c..76944469c 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png
index 262d53027..262d53027 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png
index e16ec810a..e16ec810a 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png
index fc7ba24a3..fc7ba24a3 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png
index e2aef1177..e2aef1177 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png
index bc71d3a65..bc71d3a65 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png
index 501a75d63..501a75d63 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png