aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Doits <markus.doits@gmail.com>2010-12-30 13:47:10 +0000
committerMarkus Doits <markus.doits@gmail.com>2010-12-30 13:47:10 +0000
commit86e06eeabeaff5e9470ec23b2cc02ebd74fd15d9 (patch)
treee1b461977b784573c9bf188dd6038720ab4f2121
parent1edac5a61ee36d466daeb91dea86b4ff3c2a2ccf (diff)
downloadopen-keychain-86e06eeabeaff5e9470ec23b2cc02ebd74fd15d9.tar.gz
open-keychain-86e06eeabeaff5e9470ec23b2cc02ebd74fd15d9.tar.bz2
open-keychain-86e06eeabeaff5e9470ec23b2cc02ebd74fd15d9.zip
Allow to regenerate shared preferences
Merge of r326 to trunk
-rw-r--r--src/org/thialfihar/android/apg/Preferences.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/org/thialfihar/android/apg/Preferences.java b/src/org/thialfihar/android/apg/Preferences.java
index d22565804..e704d79f3 100644
--- a/src/org/thialfihar/android/apg/Preferences.java
+++ b/src/org/thialfihar/android/apg/Preferences.java
@@ -12,9 +12,13 @@ public class Preferences {
private static Preferences mPreferences;
private SharedPreferences mSharedPreferences;
- public static synchronized Preferences getPreferences(Context context)
+ public static synchronized Preferences getPreferences(Context context) {
+ return getPreferences(context, false);
+ }
+
+ public static synchronized Preferences getPreferences(Context context, boolean force_new)
{
- if (mPreferences == null) {
+ if (mPreferences == null || force_new) {
mPreferences = new Preferences(context);
}
return mPreferences;