From c3b47ecd5a380678dd2df3dc2549155429d28514 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 30 Mar 2016 20:45:40 +0200 Subject: [PATCH] fix lint warning: CommitPrefEdits: use apply() instead of commit() "Consider using apply() instead; commit writes its data to persistent storage immediately, whereas apply will handle it in the background" commit() is only useful if the code actually checks the return value. --- app/src/main/java/org/fdroid/fdroid/Preferences.java | 10 +++++----- app/src/main/java/org/fdroid/fdroid/UpdateService.java | 2 +- .../fdroid/fdroid/views/fragments/AppListFragment.java | 2 +- .../fdroid/views/fragments/AvailableAppsFragment.java | 2 +- .../fdroid/views/fragments/PreferencesFragment.java | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java index c436694a2..d9243712a 100644 --- a/app/src/main/java/org/fdroid/fdroid/Preferences.java +++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java @@ -40,7 +40,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh if (preferences.getString(PREF_LOCAL_REPO_NAME, null) == null) { preferences.edit() .putString(PREF_LOCAL_REPO_NAME, getDefaultLocalRepoName()) - .commit(); + .apply(); } } @@ -113,7 +113,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh } public void setPrivilegedInstallerEnabled(boolean enable) { - preferences.edit().putBoolean(PREF_PRIVILEGED_INSTALLER, enable).commit(); + preferences.edit().putBoolean(PREF_PRIVILEGED_INSTALLER, enable).apply(); } public boolean isFirstTime() { @@ -121,7 +121,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh } public void setFirstTime(boolean firstTime) { - preferences.edit().putBoolean(PREF_FIRST_TIME, firstTime).commit(); + preferences.edit().putBoolean(PREF_FIRST_TIME, firstTime).apply(); } public boolean isPostPrivilegedInstall() { @@ -129,7 +129,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh } public void setPostPrivilegedInstall(boolean postInstall) { - preferences.edit().putBoolean(PREF_POST_PRIVILEGED_INSTALL, postInstall).commit(); + preferences.edit().putBoolean(PREF_POST_PRIVILEGED_INSTALL, postInstall).apply(); } public boolean shouldCacheApks() { @@ -149,7 +149,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh } public void setShowNfcDuringSwap(boolean show) { - preferences.edit().putBoolean(PREF_SHOW_NFC_DURING_SWAP, show).commit(); + preferences.edit().putBoolean(PREF_SHOW_NFC_DURING_SWAP, show).apply(); } public boolean expertMode() { diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java index 927d4783d..407a27078 100644 --- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java +++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java @@ -406,7 +406,7 @@ public class UpdateService extends IntentService implements ProgressListener { SharedPreferences.Editor e = prefs.edit(); e.putLong(Preferences.PREF_UPD_LAST, System.currentTimeMillis()); - e.commit(); + e.apply(); if (errorRepos == 0) { if (changes) { diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java index 35918f065..5f326cc4f 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java @@ -141,7 +141,7 @@ public abstract class AppListFragment extends ListFragment implements boolean hasTriedEmptyUpdate = prefs.getBoolean(triedEmptyUpdate, false); if (!hasTriedEmptyUpdate) { Utils.debugLog(TAG, "Empty app list, and we haven't done an update yet. Forcing repo update."); - prefs.edit().putBoolean(triedEmptyUpdate, true).commit(); + prefs.edit().putBoolean(triedEmptyUpdate, true).apply(); UpdateService.updateNow(getActivity()); return true; } diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java index 24f87f224..f75b6eafd 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java @@ -230,7 +230,7 @@ public class AvailableAppsFragment extends AppListFragment implements Context.MODE_PRIVATE); SharedPreferences.Editor e = p.edit(); e.putString(CATEGORY_KEY, currentCategory); - e.commit(); + e.apply(); } @Override diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java index c6007348e..f8a40f920 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java @@ -204,13 +204,13 @@ public class PreferencesFragment extends PreferenceFragment // privileged permission are granted, i.e. the extension is installed correctly SharedPreferences.Editor editor = pref.getSharedPreferences().edit(); editor.putBoolean(Preferences.PREF_PRIVILEGED_INSTALLER, true); - editor.commit(); + editor.apply(); pref.setChecked(true); } else { // privileged permission not available SharedPreferences.Editor editor = pref.getSharedPreferences().edit(); editor.putBoolean(Preferences.PREF_PRIVILEGED_INSTALLER, false); - editor.commit(); + editor.apply(); pref.setChecked(false); AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getActivity()); @@ -248,7 +248,7 @@ public class PreferencesFragment extends PreferenceFragment } else { SharedPreferences.Editor editor = pref.getSharedPreferences().edit(); editor.putBoolean(Preferences.PREF_PRIVILEGED_INSTALLER, false); - editor.commit(); + editor.apply(); pref.setChecked(false); }