From 031f9bb5e160d8f83b0e08816c48ebcdd13f8563 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 3 Jun 2010 16:24:04 +0000 Subject: [PATCH] make sure previously cache settings of "until quit" are changed to the new default of 3 minutes, as indefinite caching is no longer supported --- src/org/thialfihar/android/apg/BaseActivity.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/org/thialfihar/android/apg/BaseActivity.java b/src/org/thialfihar/android/apg/BaseActivity.java index 3e302b6cc..210e09409 100644 --- a/src/org/thialfihar/android/apg/BaseActivity.java +++ b/src/org/thialfihar/android/apg/BaseActivity.java @@ -368,7 +368,14 @@ public class BaseActivity extends Activity } public int getPassPhraseCacheTtl() { - return mPreferences.getInt(Constants.pref.pass_phrase_cache_ttl, 300); + int ttl = mPreferences.getInt(Constants.pref.pass_phrase_cache_ttl, 180); + // fix the value if it was set to "never" in previous versions, which currently is not + // supported + if (ttl == 0) { + ttl = 180; + setPassPhraseCacheTtl(ttl); + } + return ttl; } public void setPassPhraseCacheTtl(int value) { @@ -377,7 +384,7 @@ public class BaseActivity extends Activity editor.commit(); Intent intent = new Intent(this, Service.class); - intent.putExtra(Service.EXTRA_TTL, getPassPhraseCacheTtl()); + intent.putExtra(Service.EXTRA_TTL, value); startService(intent); }