From 4078b3475e5140e6f5f9ef924bc8ff8d9e345113 Mon Sep 17 00:00:00 2001
From: ByteHamster <ByteHamster@users.noreply.github.com>
Date: Sun, 24 Mar 2024 21:08:06 +0100
Subject: Simplify playback preferences and move to :storage:preferences
 (#7024)

---
 .../java/de/danoeh/antennapod/model/feed/FeedMedia.java    | 14 --------------
 .../java/de/danoeh/antennapod/model/playback/Playable.java |  9 ---------
 .../de/danoeh/antennapod/model/playback/RemoteMedia.java   |  6 ------
 3 files changed, 29 deletions(-)

(limited to 'model/src/main/java/de')

diff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java
index 571cbc128..698cdf34e 100644
--- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java
+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.model.feed;
 
 import android.content.Context;
-import android.content.SharedPreferences.Editor;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -23,9 +22,6 @@ public class FeedMedia implements Playable {
     public static final int PLAYABLE_TYPE_FEEDMEDIA = 1;
     public static final String FILENAME_PREFIX_EMBEDDED_COVER = "metadata-retriever:";
 
-    public static final String PREF_MEDIA_ID = "FeedMedia.PrefMediaId";
-    private static final String PREF_FEED_ID = "FeedMedia.PrefFeedId";
-
     /**
      * Indicates we've checked on the size of the item via the network
      * and got an invalid response. Using Integer.MIN_VALUE because
@@ -303,16 +299,6 @@ public class FeedMedia implements Playable {
         dest.writeLong(lastPlayedTime);
     }
 
-    @Override
-    public void writeToPreferences(Editor prefEditor) {
-        if (item != null && item.getFeed() != null) {
-            prefEditor.putLong(PREF_FEED_ID, item.getFeed().getId());
-        } else {
-            prefEditor.putLong(PREF_FEED_ID, 0L);
-        }
-        prefEditor.putLong(PREF_MEDIA_ID, id);
-    }
-
     @Override
     public String getEpisodeTitle() {
         if (item == null) {
diff --git a/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java b/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java
index e48be9aec..8bf1c4e20 100644
--- a/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java
+++ b/model/src/main/java/de/danoeh/antennapod/model/playback/Playable.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.model.playback;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Parcelable;
 
 import androidx.annotation.Nullable;
@@ -17,14 +16,6 @@ import java.util.List;
 public interface Playable extends Parcelable, Serializable {
     int INVALID_TIME = -1;
 
-    /**
-     * Save information about the playable in a preference so that it can be
-     * restored later via PlaybackPreferences.createInstanceFromPreferences.
-     * Implementations must NOT call commit() after they have written the values
-     * to the preferences file.
-     */
-    void writeToPreferences(SharedPreferences.Editor prefEditor);
-
     /**
      * Returns the title of the episode that this playable represents
      */
diff --git a/model/src/main/java/de/danoeh/antennapod/model/playback/RemoteMedia.java b/model/src/main/java/de/danoeh/antennapod/model/playback/RemoteMedia.java
index 8c3cd7ce4..b963f3de1 100644
--- a/model/src/main/java/de/danoeh/antennapod/model/playback/RemoteMedia.java
+++ b/model/src/main/java/de/danoeh/antennapod/model/playback/RemoteMedia.java
@@ -1,7 +1,6 @@
 package de.danoeh.antennapod.model.playback;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
@@ -120,11 +119,6 @@ public class RemoteMedia implements Playable {
         return notes;
     }
 
-    @Override
-    public void writeToPreferences(SharedPreferences.Editor prefEditor) {
-        //it seems pointless to do it, since the session should be kept by the remote device.
-    }
-
     @Override
     public String getEpisodeTitle() {
         return episodeTitle;
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0