From d1af6dab364c0fcf092ee77318269130187444fa Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Sun, 14 Oct 2018 19:54:52 +0200 Subject: [PATCH] use apply() to store preferences. --- .../android/vanilla/FilebrowserStartActivity.java | 11 ++++------- .../android/vanilla/PlaylistObserverDirActivity.java | 12 +++--------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java b/app/src/main/java/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java index 372407be..922c84c7 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java @@ -26,15 +26,11 @@ import java.util.ArrayList; public class FilebrowserStartActivity extends FolderPickerActivity { - private SharedPreferences.Editor mPrefEditor; - - @Override + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setTitle(R.string.filebrowser_start); - mPrefEditor = PlaybackService.getSettings(this).edit(); - // Make sure that we display the current selection File startPath = FileUtils.getFilesystemBrowseStart(this); setCurrentDir(startPath); @@ -43,8 +39,9 @@ public class FilebrowserStartActivity extends FolderPickerActivity { @Override public void onFolderPicked(File directory, ArrayList a, ArrayList b) { - mPrefEditor.putString(PrefKeys.FILESYSTEM_BROWSE_START, directory.getAbsolutePath()); - mPrefEditor.commit(); + SharedPreferences.Editor editor = PlaybackService.getSettings(this).edit(); + editor.putString(PrefKeys.FILESYSTEM_BROWSE_START, directory.getAbsolutePath()); + editor.apply(); finish(); } diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/PlaylistObserverDirActivity.java b/app/src/main/java/ch/blinkenlights/android/vanilla/PlaylistObserverDirActivity.java index 9d963d05..219e46e5 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/PlaylistObserverDirActivity.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/PlaylistObserverDirActivity.java @@ -25,29 +25,23 @@ import java.io.File; import java.util.ArrayList; public class PlaylistObserverDirActivity extends FolderPickerActivity { - /** - * Shared preferences - */ - private SharedPreferences mPrefs; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setTitle(R.string.filebrowser_start); - mPrefs = PlaybackService.getSettings(this); - // Start at currently configured directory. - String current = mPrefs.getString(PrefKeys.PLAYLIST_SYNC_FOLDER, PrefDefaults.PLAYLIST_SYNC_FOLDER); + String current = PlaybackService.getSettings(this).getString(PrefKeys.PLAYLIST_SYNC_FOLDER, PrefDefaults.PLAYLIST_SYNC_FOLDER); setCurrentDir(new File(current)); } @Override public void onFolderPicked(File directory, ArrayList a, ArrayList b) { - SharedPreferences.Editor editor = mPrefs.edit(); + SharedPreferences.Editor editor = PlaybackService.getSettings(this).edit(); editor.putString(PrefKeys.PLAYLIST_SYNC_FOLDER, directory.getAbsolutePath()); - editor.commit(); + editor.apply(); finish(); }