cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ditch passphrase "time to live" setting

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-09-20 16:11:19 +02:00
parent 1f2d9c85e0
commit d04439df6b
10 changed files with 23 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/res/layout/settings_cache_ttl_fragment.xml
View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/cache_ttl_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />

11
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -20,7 +20,6 @@
<string name="title_api_registered_apps">"Apps"</string>
<string name="title_key_server_preference">"OpenPGP keyservers"</string>
<string name="title_smartpgp_authorities_preference">"SmartPGP: Trusted authorities"</string>
<string name="title_cache_ttl_preference">"Customize 'Remember' choices"</string>
<string name="title_change_passphrase">"Change Password"</string>
<string name="title_share_fingerprint_with">"Share fingerprint with…"</string>
<string name="title_share_key">"Share key with…"</string>
@@ -164,7 +163,6 @@
<string name="label_encryption_algorithm">"Encryption algorithm"</string>
<string name="label_hash_algorithm">"Hash algorithm"</string>
<string name="label_symmetric">"Encrypt with password"</string>
<string name="label_passphrase_cache_ttl">"Customize 'Remember' choices"</string>
<string name="label_passphrase_cache_subs">"Remember passwords by subkey"</string>
<string name="label_message_compression">"Text compression"</string>
<string name="label_file_compression">"File compression"</string>
@@ -1754,16 +1752,9 @@
<string name="title_edit_subkeys">"Edit Subkeys"</string>
<string name="btn_search_for_query">"Search for\n'%s'"</string>
<string name="cache_ttl_lock_screen">"until screen off"</string>
<string name="cache_ttl_ten_minutes">"for ten minutes"</string>
<string name="cache_ttl_thirty_minutes">"for thirty minutes"</string>
<string name="cache_ttl_one_hour">"for one hour"</string>
<string name="cache_ttl_three_hours">"for three hours"</string>
<string name="cache_ttl_one_day">"for one day"</string>
<string name="cache_ttl_three_days">"for three days"</string>
<string name="cache_ttl_forever">"forever"</string>
<string name="settings_cache_select_three">"Pick up to three."</string>
<string name="settings_cache_ttl_at_least_one">"At least one item must be selected!"</string>
<string name="settings_cache_ttl_max_three">"Can\'t select more than three items!"</string>
<string name="cache_ttl_forever">"until cleared"</string>
<string name="remember">"Remember"</string>
<string name="security_token_error_pgp_app_not_installed">"No PGP app was found on the security token"</string>
<string name="prompt_fidesmo_pgp_install_title">"Install PGP?"</string>

3
OpenKeychain/src/main/res/xml/passphrase_preferences.xml
View File

@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen
android:key="passphraseCacheTtls"
android:title="@string/label_passphrase_cache_ttl" />
<SwitchPreference
android:defaultValue="false"
android:key="passphraseCacheSubs"