diff options
| author | zeapo <mohamed@zenadi.com> | 2017-08-10 15:13:58 +0200 |
|---|---|---|
| committer | zeapo <mohamed@zenadi.com> | 2017-08-10 15:13:58 +0200 |
| commit | bf1b67ea6a255866be9765f3096c91e2236f2eaf (patch) | |
| tree | c77c56290463e3d549d4fa9eef86d1e97e6ba312 /app/src/main/res | |
| parent | 24a77b90284ee6a0832245c7f8d1d432b9db3710 (diff) | |
add remember passphrase and clearing it from settings
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/git_passphrase_layout.xml | 34 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/xml/preference.xml | 3 |
3 files changed, 39 insertions, 1 deletions
diff --git a/app/src/main/res/layout/git_passphrase_layout.xml b/app/src/main/res/layout/git_passphrase_layout.xml new file mode 100644 index 00000000..d82a0b55 --- /dev/null +++ b/app/src/main/res/layout/git_passphrase_layout.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/linearLayout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <EditText + android:id="@+id/sshkey_passphrase" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" + android:ems="10" + android:inputType="textPassword" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <CheckBox + android:id="@+id/sshkey_remember_passphrase" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + android:layout_marginRight="16dp" + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" + android:text="Remember until the application is closed" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/sshkey_passphrase" /> +</android.support.constraint.ConstraintLayout>
\ 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 7805ad08..e39cb6f5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,7 +46,7 @@ <string name="ssh_preferences_dialog_import">Import</string> <string name="ssh_preferences_dialog_generate">Generate</string> <string name="passphrase_dialog_title">Authenticate</string> - <string name="passphrase_dialog_text">Please provide the passphrase for your SSH key. Leave it empty if there is no passphrase.</string> + <string name="passphrase_dialog_text">Please provide the passphrase for your SSH key</string> <string name="password_dialog_text">Please provide the password for this repository</string> <!-- Clone fragment --> @@ -208,4 +208,5 @@ <string name="git_push_generic_error">Push was rejected by remote, reason:</string> <string name="git_push_other_error">Remote rejected non-fast-forward push. Check receive.denyNonFastForwards variable in config file of destination repository.</string> <string name="jgit_error_push_dialog_text">Error occurred during the push operation:</string> + <string name="ssh_key_clear_passphrase">Clear ssh-key saved passphrase</string> </resources> diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml index 87e77aae..23e68577 100644 --- a/app/src/main/res/xml/preference.xml +++ b/app/src/main/res/xml/preference.xml @@ -14,6 +14,9 @@ android:key="ssh_keygen" android:title="@string/pref_ssh_keygen_title" /> <Preference + android:key="ssh_key_clear_passphrase" + android:title="@string/ssh_key_clear_passphrase" /> + <Preference android:key="ssh_see_key" android:title="@string/pref_ssh_see_key_title" /> <Preference |