diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-18 19:23:40 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-01-06 16:25:50 +0100 |
| commit | 7eafe5d1e81fe3f72e66b600736e55f8eb21f038 (patch) | |
| tree | 0e5b144e033026590dc6660e904aef3a632eac23 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util | |
| parent | 52ab77d2a41d8d2e61cc864dbfd63dd1185a184b (diff) | |
| download | open-keychain-7eafe5d1e81fe3f72e66b600736e55f8eb21f038.tar.gz open-keychain-7eafe5d1e81fe3f72e66b600736e55f8eb21f038.tar.bz2 open-keychain-7eafe5d1e81fe3f72e66b600736e55f8eb21f038.zip | |
inline-ttl: support "screen off" in preference
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java index 8074d8eb1..cf4e5ad21 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java @@ -321,6 +321,7 @@ public class Preferences { public static final ArrayList<Integer> CACHE_TTLS; static { HashMap<Integer,Integer> cacheTtlNames = new HashMap<>(); + cacheTtlNames.put(0, R.string.cache_ttl_lock_screen); cacheTtlNames.put(60 * 5, R.string.cache_ttl_five_minutes); cacheTtlNames.put(60 * 60, R.string.cache_ttl_one_hour); cacheTtlNames.put(60 * 60 * 3, R.string.cache_ttl_three_hours); @@ -353,10 +354,11 @@ public class Preferences { public static CacheTTLPrefs getDefault() { ArrayList<String> ttlStrings = new ArrayList<>(); + ttlStrings.add(Integer.toString(0)); ttlStrings.add(Integer.toString(60 * 5)); ttlStrings.add(Integer.toString(60 * 60)); ttlStrings.add(Integer.toString(60 * 60 * 24)); - return new CacheTTLPrefs(ttlStrings, 60 * 5); + return new CacheTTLPrefs(ttlStrings, 0); } } |