Fix EnhancedBrowseFragment registering multiple listeners

jellyfin · Oct 28, 2022 · b5a6e73 · b5a6e73
1 parent d5a9744
commit b5a6e73
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/browsing/CompositeClickedListener.kt b/app/src/main/java/org/jellyfin/androidtv/ui/browsing/CompositeClickedListener.kt
@@ -20,4 +20,6 @@ class CompositeClickedListener : OnItemViewClickedListener {
  listener.onItemClicked(itemViewHolder, item, rowViewHolder, row)
  }
  }
+
+ fun removeListeners() = listeners.clear()
 }
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/browsing/CompositeSelectedListener.kt b/app/src/main/java/org/jellyfin/androidtv/ui/browsing/CompositeSelectedListener.kt
@@ -20,4 +20,6 @@ class CompositeSelectedListener : OnItemViewSelectedListener {
  listener.onItemSelected(itemViewHolder, item, rowViewHolder, row)
  }
  }
+
+ fun removeListeners() = listeners.clear()
 }
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/browsing/EnhancedBrowseFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/browsing/EnhancedBrowseFragment.java
@@ -12,6 +12,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -146,9 +147,22 @@ public void onActivityCreated(Bundle savedInstanceState) {
 
  setupViews();
  setupQueries(this);
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
  setupEventListeners();
  }
 
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ mClickedListener.removeListeners();
+ mSelectedListener.removeListeners();
+ }
+
  protected void setupQueries(RowLoader rowLoader) {
  rowLoader.loadRows(mRows);
  }