fix: random crash on select LiquidKeyboard tab

RecycleView's notifyItemRangeChanged may has bugs, use notifyItemRangeRemoved and notifyItemRangeInserted.
osfans · Feb 14, 2024 · 696a259 · 696a259
1 parent c1e3dfc
commit 696a259
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/CandidateAdapter.kt b/app/src/main/java/com/osfans/trime/ime/symbol/CandidateAdapter.kt
@@ -32,9 +32,11 @@ class CandidateAdapter(private val theme: Theme) : RecyclerView.Adapter<Candidat
     }
 
     fun updateCandidates(candidates: List<CandidateListItem>) {
+        val prevSize = mCandidates.size
         mCandidates.clear()
+        notifyItemRangeRemoved(0, prevSize)
         mCandidates.addAll(candidates)
-        notifyItemRangeChanged(0, candidates.size)
+        notifyItemRangeInserted(0, candidates.size)
     }
 
     override fun getItemCount(): Int {

diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/FlexibleAdapter.kt b/app/src/main/java/com/osfans/trime/ime/symbol/FlexibleAdapter.kt
@@ -43,14 +43,15 @@ class FlexibleAdapter(
                     else -> b2.id.compareTo(b1.id)
                 }
             }
+        val prevSize = mBeans.size
         mBeans.clear()
+        notifyItemRangeRemoved(0, prevSize)
         mBeans.addAll(sorted)
+        notifyItemRangeChanged(0, sorted.size)
         mBeansId.clear()
         mBeans.forEachIndexed { index: Int, (id): DatabaseBean ->
             mBeansId[id] = index
         }
-        // 更新视图
-        notifyItemRangeChanged(0, mBeans.size)
     }
 
     override fun getItemCount(): Int = mBeans.size

diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/SimpleAdapter.kt b/app/src/main/java/com/osfans/trime/ime/symbol/SimpleAdapter.kt
@@ -21,11 +21,13 @@ class SimpleAdapter(private val theme: Theme, private val columnSize: Int) : Rec
         get() = mBeans
 
     fun updateBeans(beans: List<SimpleKeyBean>) {
+        val prevSize = mBeans.size
         mBeans.clear()
+        notifyItemRangeRemoved(0, prevSize)
         mBeans.addAll(beans)
+        notifyItemRangeInserted(0, beans.size)
         mBeansByRows.clear()
         mBeansByRows.addAll(beans.chunked(columnSize))
-        notifyItemRangeChanged(0, mBeans.size)
     }
 
     override fun getItemCount(): Int {