diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-07 21:40:27 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
commit | 25d07d173c9b4d8da9e1596ea6286047fa8f111e (patch) | |
tree | 4b1b06cc4320ec85c0252e560dc51c4c84b6a0da /OpenKeychain | |
parent | 007d02f01b1381d218a248a377e186b4549a5e0e (diff) | |
download | open-keychain-25d07d173c9b4d8da9e1596ea6286047fa8f111e.tar.gz open-keychain-25d07d173c9b4d8da9e1596ea6286047fa8f111e.tar.bz2 open-keychain-25d07d173c9b4d8da9e1596ea6286047fa8f111e.zip |
fixed prefs
Diffstat (limited to 'OpenKeychain')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java | 3 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java index 4dbfe1a97..94b854b73 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java @@ -222,6 +222,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + // makes android's preference framework write to our file instead of default + // This allows us to use the "persistent" attribute to simplify code + sPreferences.setPreferenceManagerFileAndMode(getPreferenceManager()); // Load the preferences from an XML resource addPreferencesFromResource(R.xml.proxy_prefs); 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 ab33f30bf..536f956cd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.res.Resources; +import android.preference.PreferenceManager; import info.guardianproject.onionkit.ui.OrbotHelper; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants.Pref; @@ -42,6 +43,9 @@ public class Preferences { private SharedPreferences mSharedPreferences; private Resources mResources; + private static String PREF_FILE_NAME = "APG.main"; + private static int PREF_FILE_MODE = Context.MODE_MULTI_PROCESS; + public static synchronized Preferences getPreferences(Context context) { return getPreferences(context, false); } @@ -61,9 +65,14 @@ public class Preferences { updateSharedPreferences(context); } + public void setPreferenceManagerFileAndMode(PreferenceManager manager) { + manager.setSharedPreferencesName(PREF_FILE_NAME); + manager.setSharedPreferencesMode(PREF_FILE_MODE); + } + public void updateSharedPreferences(Context context) { // multi-process safe preferences - mSharedPreferences = context.getSharedPreferences("APG.main", Context.MODE_MULTI_PROCESS); + mSharedPreferences = context.getSharedPreferences(PREF_FILE_NAME, PREF_FILE_MODE); } public String getLanguage() { |