From 9a716ba4ac070c502dd85967056a0474e0315fee Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 14 Sep 2019 20:52:27 +0200
Subject: [PATCH] Calling apply() on preferences edit

---
 .../java/de/danoeh/antennapod/activity/MainActivity.java | 2 +-
 .../danoeh/antennapod/fragment/EpisodesListFragment.java | 4 ++--
 .../de/danoeh/antennapod/fragment/QueueFragment.java     | 2 +-
 app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java  | 4 ++--
 .../core/service/playback/PlaybackService.java           | 9 +++------
 .../antennapod/core/util/playback/ExternalMedia.java     | 2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index 339ce01c2..a0a3c85c2 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -240,7 +240,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
 
             SharedPreferences.Editor edit = prefs.edit();
             edit.putBoolean(PREF_IS_FIRST_LAUNCH, false);
-            edit.commit();
+            edit.apply();
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
index 1cedb5a91..951dad38e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
@@ -149,7 +149,7 @@ public abstract class EpisodesListFragment extends Fragment {
         SharedPreferences.Editor editor = prefs.edit();
         editor.putInt(PREF_SCROLL_POSITION, firstItem);
         editor.putFloat(PREF_SCROLL_OFFSET, topOffset);
-        editor.commit();
+        editor.apply();
     }
 
     private void restoreScrollPosition() {
@@ -162,7 +162,7 @@ public abstract class EpisodesListFragment extends Fragment {
             SharedPreferences.Editor editor = prefs.edit();
             editor.putInt(PREF_SCROLL_POSITION, 0);
             editor.putFloat(PREF_SCROLL_OFFSET, 0.0f);
-            editor.commit();
+            editor.apply();
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 9763f8f2d..fd4b9e7c2 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -223,7 +223,7 @@ public class QueueFragment extends Fragment {
         SharedPreferences.Editor editor = prefs.edit();
         editor.putInt(PREF_SCROLL_POSITION, firstItem);
         editor.putFloat(PREF_SCROLL_OFFSET, topOffset);
-        editor.commit();
+        editor.apply();
     }
 
     private void restoreScrollPosition() {
diff --git a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
index 03958508d..5fa6588d9 100644
--- a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
+++ b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
@@ -46,7 +46,7 @@ public class SPAUtil {
 
             SharedPreferences.Editor editor = prefs.edit();
             editor.putBoolean(PREF_HAS_QUERIED_SP_APPS, true);
-            editor.commit();
+            editor.apply();
 
             return true;
         } else {
@@ -63,7 +63,7 @@ public class SPAUtil {
             SharedPreferences.Editor editor = PreferenceManager
                     .getDefaultSharedPreferences(c.getApplicationContext()).edit();
             editor.putBoolean(PREF_HAS_QUERIED_SP_APPS, false);
-            editor.commit();
+            editor.apply();
         }
     }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index e479a7711..ace89e40a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -1086,7 +1086,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         editor.putInt(
                 PlaybackPreferences.PREF_CURRENT_PLAYER_STATUS, playerStatus);
 
-        editor.commit();
+        editor.apply();
     }
 
     private void writePlayerStatusPlaybackPreferences() {
@@ -1095,11 +1095,8 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         SharedPreferences.Editor editor = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext()).edit();
         int playerStatus = getCurrentPlayerStatusAsInt(mediaPlayer.getPlayerStatus());
-
-        editor.putInt(
-                PlaybackPreferences.PREF_CURRENT_PLAYER_STATUS, playerStatus);
-
-        editor.commit();
+        editor.putInt(PlaybackPreferences.PREF_CURRENT_PLAYER_STATUS, playerStatus);
+        editor.apply();
     }
 
     private void sendNotificationBroadcast(int type, int code) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/ExternalMedia.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/ExternalMedia.java
index 645bae5f3..9b644c3ba 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/ExternalMedia.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/ExternalMedia.java
@@ -182,7 +182,7 @@ public class ExternalMedia implements Playable {
 		editor.putLong(PREF_LAST_PLAYED_TIME, timestamp);
 		position = newPosition;
 		lastPlayedTime = timestamp;
-		editor.commit();
+		editor.apply();
 	}
 
 	@Override