Merge branch 'master' into develop

2 files changed, 11 insertions, 1 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/SwipePreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/SwipePreferencesFragment.java
index 44330c236..b56dd5253 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/SwipePreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/SwipePreferencesFragment.java
@@ -5,6 +5,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.PreferenceActivity;
 import de.danoeh.antennapod.dialog.SwipeActionsDialog;
+import de.danoeh.antennapod.fragment.AllEpisodesFragment;
 import de.danoeh.antennapod.fragment.CompletedDownloadsFragment;
 import de.danoeh.antennapod.fragment.FeedItemlistFragment;
 import de.danoeh.antennapod.fragment.InboxFragment;
@@ -13,6 +14,7 @@ import de.danoeh.antennapod.fragment.QueueFragment;
 public class SwipePreferencesFragment extends PreferenceFragmentCompat {
     private static final String PREF_SWIPE_QUEUE = "prefSwipeQueue";
     private static final String PREF_SWIPE_INBOX = "prefSwipeInbox";
+    private static final String PREF_SWIPE_EPISODES = "prefSwipeEpisodes";
     private static final String PREF_SWIPE_DOWNLOADS = "prefSwipeDownloads";
     private static final String PREF_SWIPE_FEED = "prefSwipeFeed";
 
@@ -28,6 +30,10 @@ public class SwipePreferencesFragment extends PreferenceFragmentCompat {
             new SwipeActionsDialog(requireContext(), InboxFragment.TAG).show(() -> { });
             return true;
         });
+        findPreference(PREF_SWIPE_EPISODES).setOnPreferenceClickListener(preference -> {
+            new SwipeActionsDialog(requireContext(), AllEpisodesFragment.TAG).show(() -> { });
+            return true;
+        });
         findPreference(PREF_SWIPE_DOWNLOADS).setOnPreferenceClickListener(preference -> {
             new SwipeActionsDialog(requireContext(), CompletedDownloadsFragment.TAG).show(() -> { });
             return true;
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/swipeactions/TogglePlaybackStateSwipeAction.java b/app/src/main/java/de/danoeh/antennapod/fragment/swipeactions/TogglePlaybackStateSwipeAction.java
index d4ce8b1d2..8d4133058 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/swipeactions/TogglePlaybackStateSwipeAction.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/swipeactions/TogglePlaybackStateSwipeAction.java
@@ -39,6 +39,10 @@ public class TogglePlaybackStateSwipeAction implements SwipeAction {
 
     @Override
     public boolean willRemove(FeedItemFilter filter, FeedItem item) {
-        return filter.showUnplayed || filter.showPlayed || filter.showNew;
+        if (item.getPlayState() == FeedItem.NEW) {
+            return filter.showPlayed || filter.showNew;
+        } else {
+            return filter.showUnplayed || filter.showPlayed || filter.showNew;
+        }
     }
 }