Merge pull request #351 from skydoves/stream-chat/6.4.3

Migrate to Stream Chat SDK to 6.4.3

Author: skydoves

app/src/main/kotlin/com/skydoves/chatgpt/ChatGPTApp.kt

@@ -17,7 +17,6 @@
 package com.skydoves.chatgpt
 
 import android.app.Application
-import com.skydoves.snitcher.Snitcher
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
@@ -28,6 +27,6 @@ class ChatGPTApp : Application() {
 
     // install Snitcher to trace global exceptions and restore the app.
     // https://github.com/skydoves/snitcher
-    Snitcher.install(this)
+//    Snitcher.install(this)
   }
 }

feature-chat/src/main/kotlin/com/skydoves/chatgpt/feature/chat/messages/ChatGPTMessages.kt

@@ -254,7 +254,8 @@ fun ChatGPTMessages(
                 listViewModel,
                 composerViewModel
               )
-            }
+            },
+            reactionSorting = { _, _ -> 0 }
           )
         }
       }
@@ -327,7 +328,13 @@ private fun MessageDialogs(listViewModel: MessageListViewModel) {
       message = stringResource(
         id = io.getstream.chat.android.compose.R.string.stream_compose_flag_message_text
       ),
-      onPositiveAction = { listViewModel.flagMessage(flagAction.message) },
+      onPositiveAction = {
+        listViewModel.flagMessage(
+          flagAction.message,
+          customData = mapOf(),
+          reason = null
+        )
+      },
       onDismiss = { listViewModel.dismissMessageAction(flagAction) }
     )
   }

feature-chat/src/main/kotlin/com/skydoves/chatgpt/feature/chat/messages/ChatGPTMessagesViewModel.kt

@@ -35,7 +35,6 @@ import com.skydoves.chatgpt.feature.chat.worker.ChatGPTMessageWorker.Companion.D
 import com.skydoves.chatgpt.feature.chat.worker.ChatGPTMessageWorker.Companion.DATA_MESSAGE_ID
 import com.skydoves.chatgpt.feature.chat.worker.ChatGPTMessageWorker.Companion.DATA_SUCCESS
 import com.skydoves.chatgpt.feature.chat.worker.ChatGPTMessageWorker.Companion.MESSAGE_EXTRA_CHAT_GPT
-import com.skydoves.viewmodel.lifecycle.viewModelLifecycleOwner
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.models.Message
@@ -47,6 +46,7 @@ import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
@@ -93,20 +93,20 @@ class ChatGPTMessagesViewModel @Inject constructor(
       val workRequest = buildGPTMessageWorkerRequest(text, lastGptMessage)
       workManager.enqueue(workRequest)
 
-      val workInfo = workManager.getWorkInfoByIdLiveData(workRequest.id)
-      workInfo.observe(viewModelLifecycleOwner) {
-        if (it.state == WorkInfo.State.SUCCEEDED) {
-          val gptMessageText = it.outputData.getString(DATA_SUCCESS)
-          val gptMessageId = it.outputData.getString(DATA_MESSAGE_ID)
-          streamLog { "gpt message worker success: $gptMessageId $gptMessageText" }
-          messageItemSet.value -= text
-        } else if (it.state == WorkInfo.State.FAILED) {
-          val error = it.outputData.getString(DATA_FAILURE) ?: ""
-          streamLog { "gpt message worker failed: $error" }
-          messageItemSet.value -= messageItemSet.value
-          mutableError.value = error
+      workManager.getWorkInfoByIdFlow(workRequest.id)
+        .collectLatest {
+          if (it.state == WorkInfo.State.SUCCEEDED) {
+            val gptMessageText = it.outputData.getString(DATA_SUCCESS)
+            val gptMessageId = it.outputData.getString(DATA_MESSAGE_ID)
+            streamLog { "gpt message worker success: $gptMessageId $gptMessageText" }
+            messageItemSet.value -= text
+          } else if (it.state == WorkInfo.State.FAILED) {
+            val error = it.outputData.getString(DATA_FAILURE) ?: ""
+            streamLog { "gpt message worker failed: $error" }
+            messageItemSet.value -= messageItemSet.value
+            mutableError.value = error
+          }
         }
-      }
     }
   }
 

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-streamChatSDK = "6.3.1"
+streamChatSDK = "6.4.3"
 streamLog = "1.1.4"
 balloon = "1.6.5"
 landscapist = "2.3.6"
-androidGradlePlugin = "8.5.1"
+androidGradlePlugin = "8.4.2"
 androidxActivity = "1.9.0"
 androidxAppCompat = "1.7.0"
 androidxCompose = "1.6.8"