fix crash when updating paints

crackededed · Jan 18, 2025 · b9d4bf3 · b9d4bf3
1 parent 91aeacc
commit b9d4bf3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ChatView.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ChatView.kt
@@ -672,7 +672,7 @@ class ChatView : ConstraintLayout {
 
     private fun updateUserMessages(userId: String) {
         adapter.messages?.toList()?.let { messages ->
-            messages.filter { it.userId == userId }.forEach { message ->
+            messages.filter { it.userId != null && it.userId == userId }.forEach { message ->
                 messages.indexOf(message).takeIf { it != -1 }?.let {
                     adapter.notifyItemChanged(it)
                 }

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/MessageClickedDialog.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/MessageClickedDialog.kt
@@ -332,7 +332,7 @@ class MessageClickedDialog : BottomSheetDialogFragment(), IntegrityDialog.Callba
     fun updateUserMessages(userId: String) {
         adapter?.let { adapter ->
             adapter.messages?.toList()?.let { messages ->
-                messages.filter { it.userId == userId }.forEach { message ->
+                messages.filter { it.userId != null && it.userId == userId }.forEach { message ->
                     messages.indexOf(message).takeIf { it != -1 }?.let {
                         adapter.notifyItemChanged(it)
                     }

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ReplyClickedDialog.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ReplyClickedDialog.kt
@@ -168,7 +168,7 @@ class ReplyClickedDialog : BottomSheetDialogFragment() {
     fun updateUserMessages(userId: String) {
         adapter?.let { adapter ->
             adapter.messages?.toList()?.let { messages ->
-                messages.filter { it.userId == userId }.forEach { message ->
+                messages.filter { it.userId != null && it.userId == userId }.forEach { message ->
                     messages.indexOf(message).takeIf { it != -1 }?.let {
                         adapter.notifyItemChanged(it)
                     }