Fix some more potential leaks in Watched + Followed

chrisbanes · Nov 7, 2019 · abbe211 · abbe211
1 parent d863604
commit abbe211
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/ui-followed/src/main/java/app/tivi/home/followed/FollowedEpoxyController.kt b/ui-followed/src/main/java/app/tivi/home/followed/FollowedEpoxyController.kt
@@ -18,7 +18,6 @@ package app.tivi.home.followed
 
 import android.text.Editable
 import android.text.TextWatcher
-import android.view.View
 import app.tivi.common.epoxy.TotalSpanOverride
 import app.tivi.common.layouts.emptyState
 import app.tivi.common.layouts.filter
@@ -89,10 +88,8 @@ class FollowedEpoxyController @Inject constructor(
                 posterImage(item.images.findHighestRatedPoster())
                 posterTransitionName("show_${item.show.homepage}")
                 selected(item.show.id in state.selectedShowIds)
-                callbacks?.also { cb ->
+                clickListener { _ -> callbacks?.onItemClicked(item) }
-                    clickListener(View.OnClickListener { cb.onItemClicked(item) })
+                longClickListener { _ -> callbacks?.onItemLongClicked(item) ?: false }
-                    longClickListener(View.OnLongClickListener { cb.onItemLongClicked(item) })
-                }
             } else {
                 id("item_placeholder_$currentPosition")
             }

diff --git a/ui-watched/src/main/java/app/tivi/home/watched/WatchedEpoxyController.kt b/ui-watched/src/main/java/app/tivi/home/watched/WatchedEpoxyController.kt
@@ -18,7 +18,6 @@ package app.tivi.home.watched
 
 import android.text.Editable
 import android.text.TextWatcher
-import android.view.View
 import app.tivi.common.epoxy.TotalSpanOverride
 import app.tivi.common.layouts.emptyState
 import app.tivi.common.layouts.filter
@@ -92,10 +91,8 @@ class WatchedEpoxyController @Inject constructor(
                 posterImage(item.images.findHighestRatedPoster())
                 posterTransitionName("show_${item.show.homepage}")
                 selected(item.show.id in state.selectedShowIds)
-                callbacks?.also { cb ->
+                clickListener { _ -> callbacks?.onItemClicked(item) }
-                    clickListener(View.OnClickListener { cb.onItemClicked(item) })
+                longClickListener { _ -> callbacks?.onItemLongClicked(item) ?: false }
-                    longClickListener(View.OnLongClickListener { cb.onItemLongClicked(item) })
-                }
             } else {
                 id("item_placeholder_$currentPosition")
             }

diff --git a/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt b/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt
@@ -50,7 +50,7 @@ class WatchedFragment : TiviFragmentWithBinding<FragmentWatchedBinding>() {
 
     @Inject lateinit var controller: WatchedEpoxyController
 
-    private lateinit var authStateMenuItemBinder: AuthStateMenuItemBinder
+    private var authStateMenuItemBinder: AuthStateMenuItemBinder? = null
 
     private var currentActionMode: ActionMode? = null
 
@@ -145,7 +145,7 @@ class WatchedFragment : TiviFragmentWithBinding<FragmentWatchedBinding>() {
 
         binding.state = state
 
-        authStateMenuItemBinder.bind(state.authState, state.user)
+        authStateMenuItemBinder?.bind(state.authState, state.user)
 
         if (state.watchedShows != null) {
             // PagingEpoxyController does not like being updated before it has a list