diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/SshKeyGen.java | 21 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_pwgen.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_ssh_keygen.xml | 11 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
4 files changed, 33 insertions, 3 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/SshKeyGen.java b/app/src/main/java/com/zeapo/pwdstore/SshKeyGen.java index dd9ef5ce..c7f214f3 100644 --- a/app/src/main/java/com/zeapo/pwdstore/SshKeyGen.java +++ b/app/src/main/java/com/zeapo/pwdstore/SshKeyGen.java @@ -14,12 +14,16 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; +import android.text.InputType; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.EditText; import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; @@ -42,7 +46,7 @@ public class SshKeyGen extends AppCompatActivity { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.fragment_ssh_keygen, container, false); + final View v = inflater.inflate(R.layout.fragment_ssh_keygen, container, false); Spinner spinner = (Spinner) v.findViewById(R.id.length); Integer[] lengths = new Integer[]{2048, 4096}; @@ -50,6 +54,21 @@ public class SshKeyGen extends AppCompatActivity { android.R.layout.simple_spinner_dropdown_item, lengths); spinner.setAdapter(adapter); + CheckBox checkbox = (CheckBox) v.findViewById(R.id.show_passphrase); + checkbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + EditText editText = (EditText) v.findViewById(R.id.passphrase); + int selection = editText.getSelectionEnd(); + if (isChecked) { + editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD); + } else { + editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); + } + editText.setSelection(selection); + } + }); + return v; } } diff --git a/app/src/main/res/layout/fragment_pwgen.xml b/app/src/main/res/layout/fragment_pwgen.xml index 072a78a9..da436d8d 100644 --- a/app/src/main/res/layout/fragment_pwgen.xml +++ b/app/src/main/res/layout/fragment_pwgen.xml @@ -21,7 +21,8 @@ android:layout_marginBottom="8dp" android:editable="false" android:textIsSelectable="true" - android:inputType="textVisiblePassword"/> + android:inputType="textVisiblePassword" + android:fontFamily="monospace"/> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_ssh_keygen.xml b/app/src/main/res/layout/fragment_ssh_keygen.xml index e9995885..27fe068a 100644 --- a/app/src/main/res/layout/fragment_ssh_keygen.xml +++ b/app/src/main/res/layout/fragment_ssh_keygen.xml @@ -36,9 +36,18 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/ssh_keygen_passphrase" - android:inputType="textVisiblePassword"/> + android:inputType="textPassword" + android:fontFamily="monospace"/> </android.support.design.widget.TextInputLayout> + <CheckBox + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ssh_keygen_show_passphrase" + android:id="@+id/show_passphrase" + android:checked="false" + android:layout_marginTop="8dp"/> + <android.support.design.widget.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9fae848d..f77b732d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -133,6 +133,7 @@ <string name="ssh_keygen_generate">Generate</string> <string name="ssh_keygen_copy">Copy</string> <string name="ssh_keygen_tip">Provide this public key to your Git server.</string> + <string name="ssh_keygen_show_passphrase">Show passphrase</string> <!-- Misc --> <string name="dialog_ok">OK</string> |