[fix]: possible crash of getting current item in not visible view holder

F0x1d · Oct 12, 2023 · 69f51c3 · 69f51c3
1 parent 0d310f9
commit 69f51c3
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/app/src/main/java/com/f0x1d/logfox/ui/fragment/base/BaseViewModelFragment.kt b/app/src/main/java/com/f0x1d/logfox/ui/fragment/base/BaseViewModelFragment.kt
@@ -22,7 +22,9 @@ abstract class BaseViewModelFragment<T : BaseViewModel, D : ViewBinding>: BaseFr
         viewModel.snackbarEventsData.observe(viewLifecycleOwner) {
             if (it.isConsumed) return@observe
 
-            snackbar(it.consume<String>()!!)
+            it.consume<String>()?.also { message ->
+                snackbar(message)
+            }
         }
     }
 

diff --git a/app/src/main/java/com/f0x1d/logfox/ui/viewholder/AppViewHolder.kt b/app/src/main/java/com/f0x1d/logfox/ui/viewholder/AppViewHolder.kt
@@ -13,7 +13,7 @@ class AppViewHolder(
 
     init {
         binding.root.setOnClickListener {
-            click(currentItem)
+            click(currentItem ?: return@setOnClickListener)
         }
     }
 

diff --git a/app/src/main/java/com/f0x1d/logfox/ui/viewholder/CrashViewHolder.kt b/app/src/main/java/com/f0x1d/logfox/ui/viewholder/CrashViewHolder.kt
@@ -17,10 +17,10 @@ class CrashViewHolder(
 
     init {
         binding.root.setOnClickListener {
-            click.invoke(currentItem)
+            click.invoke(currentItem ?: return@setOnClickListener)
         }
         binding.deleteButton.setOnClickListener {
-            delete.invoke(currentItem)
+            delete.invoke(currentItem ?: return@setOnClickListener)
         }
     }
 

diff --git a/app/src/main/java/com/f0x1d/logfox/ui/viewholder/FilterViewHolder.kt b/app/src/main/java/com/f0x1d/logfox/ui/viewholder/FilterViewHolder.kt
@@ -17,15 +17,15 @@ class FilterViewHolder(
 ): BaseViewHolder<UserFilter, ItemFilterBinding>(binding) {
 
     private val checkedListener = OnlyUserCheckedChangeListener(binding.enabledBox) { button, isChecked ->
-        checked.invoke(currentItem, isChecked)
+        checked.invoke(currentItem ?: return@OnlyUserCheckedChangeListener, isChecked)
     }
 
     init {
         binding.root.setOnClickListener {
-            click.invoke(currentItem)
+            click.invoke(currentItem ?: return@setOnClickListener)
         }
         binding.deleteButton.setOnClickListener {
-            delete.invoke(currentItem)
+            delete.invoke(currentItem ?: return@setOnClickListener)
         }
         binding.enabledBox.setOnCheckedChangeListener(checkedListener)
     }

diff --git a/app/src/main/java/com/f0x1d/logfox/ui/viewholder/LogViewHolder.kt b/app/src/main/java/com/f0x1d/logfox/ui/viewholder/LogViewHolder.kt
@@ -31,7 +31,7 @@ class LogViewHolder(
                     true
                 }
                 R.id.copy_item -> {
-                    copyLog.invoke(currentItem)
+                    copyLog.invoke(currentItem ?: return@setOnMenuItemClickListener false)
                     true
                 }
 
@@ -86,7 +86,7 @@ class LogViewHolder(
     }
 
     private fun selectItem() = adapter<LogsAdapter>().selectedItems.apply {
-        currentItem.also {
+        currentItem?.also {
             if (any { logLine -> it.id == logLine.id })
                 remove(it)
             else
@@ -97,7 +97,7 @@ class LogViewHolder(
     }
 
     private fun expandOrCollapseItem() = adapter<LogsAdapter>().expandedStates.apply {
-        currentItem.also {
+        currentItem?.also {
             put(it.id, !getOrElse(it.id) { adapter<LogsAdapter>().logsExpanded })
             changeExpandedAndSelected(it)
         }

diff --git a/app/src/main/java/com/f0x1d/logfox/ui/viewholder/RecordingViewHolder.kt b/app/src/main/java/com/f0x1d/logfox/ui/viewholder/RecordingViewHolder.kt
@@ -13,10 +13,10 @@ class RecordingViewHolder(
 
     init {
         binding.root.setOnClickListener {
-            click.invoke(currentItem)
+            click.invoke(currentItem ?: return@setOnClickListener)
         }
         binding.deleteButton.setOnClickListener {
-            delete.invoke(currentItem)
+            delete.invoke(currentItem ?: return@setOnClickListener)
         }
     }
 

diff --git a/app/src/main/java/com/f0x1d/logfox/ui/viewholder/base/BaseViewHolder.kt b/app/src/main/java/com/f0x1d/logfox/ui/viewholder/base/BaseViewHolder.kt
@@ -8,7 +8,7 @@ abstract class BaseViewHolder<T, D : ViewBinding>(protected val binding: D): Rec
 
     protected val baseAdapter get() = bindingAdapter as BaseListAdapter<T, D>
     protected val elements: List<T> get() = baseAdapter.currentList
-    protected val currentItem: T get() = elements[bindingAdapterPosition]
+    protected val currentItem: T? get() = elements.getOrNull(bindingAdapterPosition)
 
     abstract fun bindTo(data: T)
     open fun recycle() {}