From 7ab41e0c3aefd33317ecf50d128bcc8b6e4d12bf Mon Sep 17 00:00:00 2001
From: John Zhen Mo <zhenmogukl@gmail.com>
Date: Wed, 7 Feb 2018 14:20:16 -0800
Subject: [PATCH] -Added listener unregistration to local item adapters to
 release dependency and avoid memory leak. -Added listener unregistration on
 all listeners using contexts in local item related fragments.

---
 .../newpipe/fragments/local/LocalItemListAdapter.java       | 4 ++++
 .../newpipe/fragments/local/LocalPlaylistFragment.java      | 5 +++++
 .../newpipe/fragments/local/PlaylistAppendDialog.java       | 1 +
 .../newpipe/fragments/local/bookmark/BookmarkFragment.java  | 3 +++
 .../local/bookmark/StatisticsPlaylistFragment.java          | 6 ++++++
 .../local/holder/LocalPlaylistStreamItemHolder.java         | 2 +-
 6 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/fragments/local/LocalItemListAdapter.java
index 0ccc13446..d36f56733 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/LocalItemListAdapter.java
@@ -71,6 +71,10 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         localItemBuilder.setOnItemSelectedListener(listener);
     }
 
+    public void unsetSelectedListener() {
+        localItemBuilder.setOnItemSelectedListener(null);
+    }
+
     public void addItems(List<? extends LocalItem> data) {
         if (data != null) {
             if (DEBUG) {
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/local/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/local/LocalPlaylistFragment.java
index ea7242055..abc12fb14 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/LocalPlaylistFragment.java
@@ -230,6 +230,11 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     public void onDestroyView() {
         super.onDestroyView();
 
+        if (itemListAdapter != null) itemListAdapter.unsetSelectedListener();
+        if (headerBackgroundButton != null) headerBackgroundButton.setOnClickListener(null);
+        if (headerPlayAllButton != null) headerPlayAllButton.setOnClickListener(null);
+        if (headerPopupButton != null) headerPopupButton.setOnClickListener(null);
+
         if (databaseSubscription != null) databaseSubscription.cancel();
         if (debouncedSaver != null) debouncedSaver.dispose();
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/local/PlaylistAppendDialog.java b/app/src/main/java/org/schabi/newpipe/fragments/local/PlaylistAppendDialog.java
index 6d18e9155..034411e4a 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/PlaylistAppendDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/PlaylistAppendDialog.java
@@ -112,6 +112,7 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
     public void onDestroyView() {
         super.onDestroyView();
         if (playlistReactor != null) playlistReactor.dispose();
+        if (playlistAdapter != null) playlistAdapter.unsetSelectedListener();
 
         playlistReactor = null;
         playlistRecyclerView = null;
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/BookmarkFragment.java
index 51bd312b0..93b0dea29 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/BookmarkFragment.java
@@ -178,6 +178,9 @@ public final class BookmarkFragment
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+        if (mostWatchedButton != null) mostWatchedButton.setOnClickListener(null);
+        if (watchHistoryButton != null) watchHistoryButton.setOnClickListener(null);
+
         if (disposables != null) disposables.clear();
         if (databaseSubscription != null) databaseSubscription.cancel();
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/StatisticsPlaylistFragment.java
index ec2dda0a4..543fc03eb 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/StatisticsPlaylistFragment.java
@@ -140,6 +140,12 @@ public abstract class StatisticsPlaylistFragment
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+
+        if (itemListAdapter != null) itemListAdapter.unsetSelectedListener();
+        if (headerBackgroundButton != null) headerBackgroundButton.setOnClickListener(null);
+        if (headerPlayAllButton != null) headerPlayAllButton.setOnClickListener(null);
+        if (headerPopupButton != null) headerPopupButton.setOnClickListener(null);
+
         if (databaseSubscription != null) databaseSubscription.cancel();
         databaseSubscription = null;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalPlaylistStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalPlaylistStreamItemHolder.java
index 4fe577aaf..0696f5f61 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalPlaylistStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/holder/LocalPlaylistStreamItemHolder.java
@@ -84,7 +84,7 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
     private View.OnTouchListener getOnTouchListener(final PlaylistStreamEntry item) {
         return (view, motionEvent) -> {
             view.performClick();
-            if (itemBuilder != null &&
+            if (itemBuilder != null && itemBuilder.getOnItemSelectedListener() != null &&
                     motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) {
                 itemBuilder.getOnItemSelectedListener().drag(item,
                         LocalPlaylistStreamItemHolder.this);