aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorMohamed Zenadi <zeapo@users.noreply.github.com>2014-12-06 18:11:42 +0100
committerMohamed Zenadi <zeapo@users.noreply.github.com>2014-12-06 18:11:42 +0100
commited26a526d340ce8fa6aff9915b6acbb73ff802b9 (patch)
treec2d6c1323af7b6802ac5bdabe2c552fef95e4f94 /app/src/main/res
parent1d2398ef85a475d50939b891b8b66bfda8d7237b (diff)
parentad35b453f0a356af6ff6ac2028507d194f09e954 (diff)
Merge pull request #53 from zeapo/feature/recursive-filtering
Filter the passwords recursively
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/strings.xml4
-rw-r--r--app/src/main/res/xml/preference.xml6
2 files changed, 8 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2f812e91..86885674 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -109,7 +109,9 @@
<string name="pref_copy_title">Automatically Copy Password</string>
<string name="pref_copy_dialog_title">Automatically copy the password to the clipboard after decryption was successful.</string>
<string name="ssh_key_error_dialog_title">Error while trying to import the ssh-key</string>
- <string name="ssh_key_error_dialog_text">Message : /n</string>
+ <string name="ssh_key_error_dialog_text">Message : \n</string>
+ <string name="pref_recursive_filter">Recursive filtering</string>
+ <string name="pref_recursive_filter_hint">Recursively find passwords of the current directory.</string>
<!-- Misc -->
<string name="dialog_ok">OK</string>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 1ad898a8..4c6e3157 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -22,10 +22,14 @@
<EditTextPreference android:title="@string/pref_password_title"
android:dialogTitle="@string/pref_password_dialog_title"
android:summary="@string/pref_password_dialog_title"
- android:hint="45" android:key="general_show_time" />
+ android:defaultValue="45" android:key="general_show_time"
+ android:inputType="number" />
<CheckBoxPreference android:title="@string/pref_copy_title"
android:dialogTitle="@string/pref_copy_dialog_title"
android:summary="@string/pref_copy_dialog_title"
android:key="copy_on_decrypt" android:defaultValue="true" />
+ <CheckBoxPreference android:title="@string/pref_recursive_filter"
+ android:summary="@string/pref_recursive_filter_hint"
+ android:key="filter_recursively" android:defaultValue="true"/>
</PreferenceCategory>
</PreferenceScreen> \ No newline at end of file