Merge pull request #5266 from ByteHamster/fix-multi-select-staying

End select mode when page is closed

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 =