From ae15b5dd0d7d57746c06a7a8c15e5d9dd14c858e Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 5 Jan 2016 01:20:28 +0100 Subject: inline-ttl: remove "default" setting --- .../keychain/ui/widget/CacheTTLSpinner.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CacheTTLSpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CacheTTLSpinner.java index 07149ec93..efaabbad2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CacheTTLSpinner.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CacheTTLSpinner.java @@ -46,23 +46,16 @@ public class CacheTTLSpinner extends AppCompatSpinner { CacheTTLPrefs prefs = Preferences.getPreferences(context).getPassphraseCacheTtl(); MatrixCursor cursor = new MatrixCursor(new String[] { "_id", "TTL", "description" }, 5); - int i = 0, defaultPosition = 0; + int i = 0; for (int ttl : CacheTTLPrefs.CACHE_TTLS) { if ( ! prefs.ttlTimes.contains(ttl)) { continue; } - if (ttl == prefs.defaultTtl) { - defaultPosition = i; - } cursor.addRow(new Object[] { i++, ttl, getContext().getString(CacheTTLPrefs.CACHE_TTL_NAMES.get(ttl)) }); } setAdapter(new SimpleCursorAdapter(getContext(), R.layout.simple_item, cursor, - new String[] { "description" }, - new int[] { R.id.simple_item_text }, - 0)); - - setSelection(defaultPosition); + new String[] { "description" }, new int[] { R.id.simple_item_text }, 0)); } public int getSelectedTimeToLive() { -- cgit v1.2.3