From 96e34c319d211169d9546be5ec44f8a1b99fc2b1 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 11 Jul 2021 11:27:38 +0200
Subject: [PATCH] End select mode when page is closed

---
 .../antennapod/fragment/CompletedDownloadsFragment.java  | 1 +
 .../danoeh/antennapod/fragment/FeedItemlistFragment.java | 3 +++
 .../de/danoeh/antennapod/fragment/QueueFragment.java     | 9 ++++-----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index f6a59f158..b166bbd96 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -120,6 +120,7 @@ public class CompletedDownloadsFragment extends Fragment implements
     @Override
     public void onDestroyView() {
         EventBus.getDefault().unregister(this);
+        adapter.endSelectMode();
         super.onDestroyView();
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
index 11f9950f9..1eb561979 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
@@ -267,6 +267,9 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
         if (disposable != null) {
             disposable.dispose();
         }
+        if (adapter != null) {
+            adapter.endSelectMode();
+        }
         adapter = null;
     }
 
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 3db53595d..b3c3d8567 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -232,14 +232,13 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi
         }
     }
 
-    private void resetViewState() {
-        recyclerAdapter = null;
-    }
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        resetViewState();
+        if (recyclerAdapter != null) {
+            recyclerAdapter.endSelectMode();
+        }
+        recyclerAdapter = null;
     }
 
     private final MenuItemUtils.UpdateRefreshMenuItemChecker updateRefreshMenuItemChecker =