From 203c89e3a8798f7f2484b4b7df8071c817a3e405 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Wed, 12 Jul 2023 15:51:07 +0800
Subject: [PATCH] Fixup! Fix a itemTouchHelper rv leak

---
 .../hippo/ehviewer/ui/scene/DownloadsScene.kt | 75 +++++++------------
 1 file changed, 28 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt
index 83e07a6cb..f16c733ab 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt
@@ -299,6 +299,34 @@ class DownloadsScene :
                 recyclerView.scrollToPosition(mInitPosition)
                 mInitPosition = -1
             }
+            val itemTouchHelper = ItemTouchHelper(object : ItemTouchHelper.Callback() {
+                override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
+                    return makeMovementFlags(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0)
+                }
+                override fun onMove(
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder,
+                    target: RecyclerView.ViewHolder,
+                ): Boolean {
+                    val fromPosition = viewHolder.bindingAdapterPosition
+                    val toPosition = target.bindingAdapterPosition
+                    if (fromPosition == toPosition) {
+                        return false
+                    }
+                    lifecycleScope.launchIO {
+                        when (mLabel) {
+                            null -> DownloadManager.moveDownload(fromPosition, toPosition)
+                            getString(R.string.default_download_label_name) -> DownloadManager.moveDownload(null, fromPosition, toPosition)
+                            else -> DownloadManager.moveDownload(mLabel, fromPosition, toPosition)
+                        }
+                        withUIContext {
+                            mAdapter!!.notifyItemMoved(fromPosition, toPosition)
+                        }
+                    }
+                    return true
+                }
+                override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {}
+            })
             itemTouchHelper.attachToRecyclerView(recyclerView)
             fastScroller.attachToRecyclerView(recyclerView)
             val handlerDrawable = HandlerDrawable()
@@ -327,7 +355,6 @@ class DownloadsScene :
         binding.recyclerView.stopScroll()
         removeAboveSnackView(binding.fabLayout)
         (binding.fabLayout.parent as ViewGroup).removeView(binding.fabLayout)
-        itemTouchHelper.attachToRecyclerView(null)
         mViewTransition = null
         mAdapter = null
         _binding = null
@@ -1186,52 +1213,6 @@ class DownloadsScene :
         }
     }
 
-    private val itemTouchHelper = ItemTouchHelper(object : ItemTouchHelper.Callback() {
-        override fun getMovementFlags(
-            recyclerView: RecyclerView,
-            viewHolder: RecyclerView.ViewHolder,
-        ): Int {
-            return makeMovementFlags(
-                ItemTouchHelper.UP or ItemTouchHelper.DOWN,
-                0,
-            )
-        }
-
-        override fun onMove(
-            recyclerView: RecyclerView,
-            viewHolder: RecyclerView.ViewHolder,
-            target: RecyclerView.ViewHolder,
-        ): Boolean {
-            val fromPosition = viewHolder.bindingAdapterPosition
-            val toPosition = target.bindingAdapterPosition
-            if (fromPosition == toPosition) {
-                return false
-            }
-            lifecycleScope.launchIO {
-                when (mLabel) {
-                    null -> {
-                        DownloadManager.moveDownload(fromPosition, toPosition)
-                    }
-
-                    getString(R.string.default_download_label_name) -> {
-                        DownloadManager.moveDownload(null, fromPosition, toPosition)
-                    }
-
-                    else -> {
-                        DownloadManager.moveDownload(mLabel, fromPosition, toPosition)
-                    }
-                }
-                withUIContext {
-                    mAdapter!!.notifyItemMoved(fromPosition, toPosition)
-                }
-            }
-            return true
-        }
-
-        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-        }
-    })
-
     companion object {
         const val KEY_GID = "gid"
         const val KEY_ACTION = "action"