Show passphrase checkbox in create key

3 files changed, 27 insertions, 0 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 be77d5042..00ac00ff4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
@@ -21,10 +21,14 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.text.method.HideReturnsTransformationMethod;
+import android.text.method.PasswordTransformationMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 
 import org.sufficientlysecure.keychain.R;
@@ -44,6 +48,7 @@ public class CreateKeyPassphraseFragment extends Fragment {
     CreateKeyActivity mCreateKeyActivity;
     PassphraseEditText mPassphraseEdit;
     EditText mPassphraseEditAgain;
+    CheckBox mShowPassphrase;
     View mBackButton;
     View mNextButton;
 
@@ -102,6 +107,7 @@ public class CreateKeyPassphraseFragment extends Fragment {
 
         mPassphraseEdit = (PassphraseEditText) view.findViewById(R.id.create_key_passphrase);
         mPassphraseEditAgain = (EditText) view.findViewById(R.id.create_key_passphrase_again);
+        mShowPassphrase = (CheckBox) view.findViewById(R.id.create_key_show_passphrase);
         mBackButton = view.findViewById(R.id.create_key_back_button);
         mNextButton = view.findViewById(R.id.create_key_next_button);
 
@@ -121,6 +127,19 @@ public class CreateKeyPassphraseFragment extends Fragment {
                 createKeyCheck();
             }
         });
+        mShowPassphrase.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    mPassphraseEdit.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
+                    mPassphraseEditAgain.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
+                } else {
+                    mPassphraseEdit.setTransformationMethod(PasswordTransformationMethod.getInstance());
+                    mPassphraseEditAgain.setTransformationMethod(PasswordTransformationMethod.getInstance());
+                }
+            }
+        });
+
 
         return view;
     }
diff --git a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
index 4b09c6cac..48b86765a 100644
--- a/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_passphrase_fragment.xml
@@ -46,6 +46,13 @@
                 android:ems="10"
                 android:layout_gravity="center_horizontal" />
 
+            <CheckBox
+                android:id="@+id/create_key_show_passphrase"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:text="@string/label_show_passphrase" />
+
         </LinearLayout>
     </ScrollView>
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8c4db3bac..e9869b0de 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -129,6 +129,7 @@
     <string name="label_passphrase">"Passphrase"</string>
     <string name="label_unlock">"Unlocking…"</string>
     <string name="label_passphrase_again">"Repeat Passphrase"</string>
+    <string name="label_show_passphrase">"Show Passphrase"</string>
     <string name="label_algorithm">"Algorithm"</string>
     <string name="label_ascii_armor">"File ASCII Armor"</string>
     <string name="label_file_ascii_armor">"Enable ASCII Armor"</string>