diff options
author | Thialfihar <thi@thialfihar.org> | 2015-07-04 19:32:39 +0200 |
---|---|---|
committer | Thialfihar <thi@thialfihar.org> | 2015-07-21 20:56:42 +0200 |
commit | 3b67c9d8942447432c1c5702d3f184b33902075c (patch) | |
tree | 28734913d90f5d76802f84ca8789efe98c1a831e /OpenKeychain/src/main/java/org | |
parent | 86d95e4d400ecc870bb69630d59a271a710a3918 (diff) | |
download | open-keychain-3b67c9d8942447432c1c5702d3f184b33902075c.tar.gz open-keychain-3b67c9d8942447432c1c5702d3f184b33902075c.tar.bz2 open-keychain-3b67c9d8942447432c1c5702d3f184b33902075c.zip |
Rename updatePreferences() to upgradePreferences()
This is really an upgrade of the preference store and not an update of
values, it also is consistent with SQLiteOpenHelper.onUpgrade().
Diffstat (limited to 'OpenKeychain/src/main/java/org')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java index d17a07d4b..cd24394d7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java @@ -97,7 +97,7 @@ public class KeychainApplication extends Application { setupAccountAsNeeded(this); // Update keyserver list as needed - Preferences.getPreferences(this).updatePreferences(); + Preferences.getPreferences(this).upgradePreferences(); TlsHelper.addStaticCA("pool.sks-keyservers.net", getAssets(), "sks-keyservers.netCA.cer"); 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 0b5189a63..9a52e3db1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java @@ -356,7 +356,7 @@ public class Preferences { } } - public void updatePreferences() { + public void upgradePreferences() { if (mSharedPreferences.getInt(Constants.Pref.PREF_DEFAULT_VERSION, 0) != Constants.Defaults.PREF_VERSION) { switch (mSharedPreferences.getInt(Constants.Pref.PREF_DEFAULT_VERSION, 0)) { |