Deskana has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175220
Change subject: Use apply method instead of commit method for SharedPreferences.
......................................................................
Use apply method instead of commit method for SharedPreferences.
The commit method updates the SharedPreferences object in memory, then
synchronously writes to storage, which can slow things down a bit. The apply
method on the other hand updates the object in memory but then writes to
storage asynchronously, which makes the method return faster. The user notices
no difference except that it's slightly faster.
This patch switches from using commit to using apply for SharedPreferences.
Change-Id: Ib3cb39f0905f87804eafb946db06c70a965f1bb3
---
M wikipedia/src/main/java/org/wikipedia/RemoteConfig.java
M wikipedia/src/main/java/org/wikipedia/SharedPreferenceCookieManager.java
M wikipedia/src/main/java/org/wikipedia/Utils.java
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
M wikipedia/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
M wikipedia/src/main/java/org/wikipedia/analytics/SessionFunnel.java
M wikipedia/src/main/java/org/wikipedia/bridge/StyleFetcherTask.java
M wikipedia/src/main/java/org/wikipedia/editing/EditTokenStorage.java
M wikipedia/src/main/java/org/wikipedia/login/UserInfoStorage.java
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M wikipedia/src/main/java/org/wikipedia/recurring/RecurringTask.java
14 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/20/175220/1
diff --git a/wikipedia/src/main/java/org/wikipedia/RemoteConfig.java
b/wikipedia/src/main/java/org/wikipedia/RemoteConfig.java
index 0ebfc12..f0a4b16 100644
--- a/wikipedia/src/main/java/org/wikipedia/RemoteConfig.java
+++ b/wikipedia/src/main/java/org/wikipedia/RemoteConfig.java
@@ -22,7 +22,7 @@
public void updateConfig(JSONObject newConfig) {
prefs.edit()
.putString(PrefKeys.getRemoteConfig(), newConfig.toString())
- .commit();
+ .apply();
curConfig = newConfig;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/SharedPreferenceCookieManager.java
b/wikipedia/src/main/java/org/wikipedia/SharedPreferenceCookieManager.java
index 8995228..8348258 100644
--- a/wikipedia/src/main/java/org/wikipedia/SharedPreferenceCookieManager.java
+++ b/wikipedia/src/main/java/org/wikipedia/SharedPreferenceCookieManager.java
@@ -98,7 +98,7 @@
editor.putString(prefKey,
makeString(makeCookieList(cookieJar.get(domain))));
}
- editor.commit();
+ editor.apply();
}
@Override
@@ -114,7 +114,7 @@
editor.remove(key);
}
editor.remove(PrefKeys.getCookieDomainsKey());
- editor.commit();
+ editor.apply();
cookieJar.clear();
}
diff --git a/wikipedia/src/main/java/org/wikipedia/Utils.java
b/wikipedia/src/main/java/org/wikipedia/Utils.java
index 687d466..cc3fe54 100644
--- a/wikipedia/src/main/java/org/wikipedia/Utils.java
+++ b/wikipedia/src/main/java/org/wikipedia/Utils.java
@@ -628,7 +628,7 @@
public static void setChannel(Context ctx) {
SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(ctx);
String channel = getChannelDescriptor(ctx);
- prefs.edit().putString(PrefKeys.getChannel(), channel).commit();
+ prefs.edit().putString(PrefKeys.getChannel(), channel).apply();
}
/**
diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index 9bd97d5..de0835d 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -347,7 +347,7 @@
public void setPrimaryLanguage(String language) {
primaryLanguage = language;
- prefs.edit().putString(PrefKeys.getContentLanguageKey(),
language).commit();
+ prefs.edit().putString(PrefKeys.getContentLanguageKey(),
language).apply();
primarySite = null;
}
@@ -496,7 +496,7 @@
installID = prefs.getString(prefKey, null);
} else {
installID = UUID.randomUUID().toString();
- prefs.edit().putString(prefKey, installID).commit();
+ prefs.edit().putString(prefKey, installID).apply();
}
return installID;
}
@@ -526,7 +526,7 @@
return;
}
currentTheme = newTheme;
- prefs.edit().putInt(PrefKeys.getColorTheme(), currentTheme).commit();
+ prefs.edit().putInt(PrefKeys.getColorTheme(), currentTheme).apply();
//update color filter for logo icon (used in ActionBar activities)...
adjustDrawableToTheme(getResources().getDrawable(R.drawable.search_w));
@@ -570,7 +570,7 @@
} else if (multiplier > FONT_SIZE_MULTIPLIER_MAX) {
multiplier = FONT_SIZE_MULTIPLIER_MAX;
}
- prefs.edit().putInt(PrefKeys.getTextSizeMultiplier(),
multiplier).commit();
+ prefs.edit().putInt(PrefKeys.getTextSizeMultiplier(),
multiplier).apply();
bus.post(new ChangeTextSizeEvent());
}
@@ -598,7 +598,7 @@
if (languageMruList != null) {
languageMruList.remove(langCode);
languageMruList.add(0, langCode);
- prefs.edit().putString(PrefKeys.getLanguageMru(),
TextUtils.join(",", languageMruList)).commit();
+ prefs.edit().putString(PrefKeys.getLanguageMru(),
TextUtils.join(",", languageMruList)).apply();
}
}
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
b/wikipedia/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
index 420f419..28d9b72 100644
--- a/wikipedia/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
+++ b/wikipedia/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
@@ -57,7 +57,7 @@
}
}
- prefs.edit().putString(PREFERENCE_KEY_ALPHA_COMMIT,
meta.optString("commit_hash")).commit();
+ prefs.edit().putString(PREFERENCE_KEY_ALPHA_COMMIT,
meta.optString("commit_hash")).apply();
}
private void showNotification() {
diff --git a/wikipedia/src/main/java/org/wikipedia/analytics/SessionFunnel.java
b/wikipedia/src/main/java/org/wikipedia/analytics/SessionFunnel.java
index 8b93e46..639bd78 100644
--- a/wikipedia/src/main/java/org/wikipedia/analytics/SessionFunnel.java
+++ b/wikipedia/src/main/java/org/wikipedia/analytics/SessionFunnel.java
@@ -77,7 +77,7 @@
.putInt(SESSION_PAGES_EXTERNAL_PREF_NAME, pagesFromExternal)
.putInt(SESSION_PAGES_HISTORY_PREF_NAME, pagesFromHistory)
.putInt(SESSION_PAGES_SAVED_PREF_NAME, pagesFromSaved)
- .putInt(SESSION_PAGES_BACK_PREF_NAME, pagesFromBack).commit();
+ .putInt(SESSION_PAGES_BACK_PREF_NAME, pagesFromBack).apply();
}
protected void log(Object... params) {
diff --git a/wikipedia/src/main/java/org/wikipedia/bridge/StyleFetcherTask.java
b/wikipedia/src/main/java/org/wikipedia/bridge/StyleFetcherTask.java
index 4e0ce18..f537ae9 100644
--- a/wikipedia/src/main/java/org/wikipedia/bridge/StyleFetcherTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/bridge/StyleFetcherTask.java
@@ -92,7 +92,7 @@
//if any of the above code throws an exception, the following
last-updated date will not
//be updated, so the task will be retried on the next go.
SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(getContext());
- prefs.edit().putString(PrefKeys.getStylesLastUpdated(),
Utils.formatISO8601(new Date())).commit();
+ prefs.edit().putString(PrefKeys.getStylesLastUpdated(),
Utils.formatISO8601(new Date())).apply();
} catch (Exception e) {
// Could be one of several exceptions, but it doesn't matter too
much, since
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/EditTokenStorage.java
b/wikipedia/src/main/java/org/wikipedia/editing/EditTokenStorage.java
index c70b407..676401b 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditTokenStorage.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditTokenStorage.java
@@ -63,7 +63,7 @@
editor.remove(key);
}
editor.remove(PrefKeys.getEditTokenWikis());
- editor.commit();
+ editor.apply();
tokenJar.clear();
}
@@ -74,7 +74,7 @@
prefs.edit()
.putString(PrefKeys.getEditTokenWikis(), wikisList)
.putString(wikiKey, token)
- .commit();
+ .apply();
}
private String makeString(Iterable<String> list) {
diff --git a/wikipedia/src/main/java/org/wikipedia/login/UserInfoStorage.java
b/wikipedia/src/main/java/org/wikipedia/login/UserInfoStorage.java
index e66bce1..cce6937 100644
--- a/wikipedia/src/main/java/org/wikipedia/login/UserInfoStorage.java
+++ b/wikipedia/src/main/java/org/wikipedia/login/UserInfoStorage.java
@@ -23,7 +23,7 @@
.putString(PREFERENCE_USERNAME, user.getUsername())
.putString(PREFERENCE_PASSWORD, user.getPassword())
.putInt(PREFERENCE_USERID, user.getUserID())
- .commit();
+ .apply();
}
public User getUser() {
@@ -45,7 +45,7 @@
.remove(PREFERENCE_USERNAME)
.remove(PREFERENCE_PASSWORD)
.remove(PREFERENCE_USERID)
- .commit();
+ .apply();
currentUser = null;
}
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index 7a488f5..ba81a9c 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -548,7 +548,7 @@
private void setImperialUnits(boolean imperial) {
showImperial = imperial;
SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(getActivity());
- prefs.edit().putBoolean(PREF_KEY_UNITS, showImperial).commit();
+ prefs.edit().putBoolean(PREF_KEY_UNITS, showImperial).apply();
getActivity().supportInvalidateOptionsMenu();
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
index d6b9aa9..a60fd33 100644
--- a/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
@@ -91,7 +91,7 @@
private void markAllAboard() {
SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(this);
- prefs.edit().putBoolean(PrefKeys.getOnboard(), true).commit();
+ prefs.edit().putBoolean(PrefKeys.getOnboard(), true).apply();
}
@Override
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index be8c67e..e5c9ecf 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -569,7 +569,7 @@
SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(app);
if (prefsKey == null || !prefs.getBoolean(prefsKey, false)) {
if (prefsKey != null) {
- prefs.edit().putBoolean(prefsKey, true).commit();
+ prefs.edit().putBoolean(prefsKey, true).apply();
}
alert = new AlertDialog.Builder(this);
diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index 7739ed6..6b2a5df 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -130,7 +130,7 @@
}
private void knowSwipe(SharedPreferences prefs, View knowToCContainer) {
- prefs.edit().putBoolean(PrefKeys.getKnowTocDrawer(), true).commit();
+ prefs.edit().putBoolean(PrefKeys.getKnowTocDrawer(), true).apply();
if (knowToCContainer.isShown()) {
ViewAnimations.crossFade(knowToCContainer, tocList);
}
diff --git a/wikipedia/src/main/java/org/wikipedia/recurring/RecurringTask.java
b/wikipedia/src/main/java/org/wikipedia/recurring/RecurringTask.java
index 31145d9..d2718bf 100644
--- a/wikipedia/src/main/java/org/wikipedia/recurring/RecurringTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/recurring/RecurringTask.java
@@ -42,7 +42,7 @@
if (shouldRun(lastRunDate)) {
Log.d("Wikipedia", "Running task " + getName());
run(lastRunDate);
- prefs.edit().putLong(prefKey, System.currentTimeMillis()).commit();
+ prefs.edit().putLong(prefKey, System.currentTimeMillis()).apply();
} else {
Log.d("Wikipedia", "Skipping task " + getName());
}
--
To view, visit https://gerrit.wikimedia.org/r/175220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3cb39f0905f87804eafb946db06c70a965f1bb3
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
