Merge pull request #5393 from nextcloud/backport/5388/stable-22.0

[stable-22.0] Feature/3074/improve threads7

Author: mahibi

app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt

@@ -1,7 +1,7 @@
 /*
  * Nextcloud Talk - Android Client
  *
- * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 Julius Linus <juliuslinus1@gmail.com>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 package com.nextcloud.talk.account

app/src/main/java/com/nextcloud/talk/account/viewmodels/BrowserLoginActivityViewModel.kt

@@ -1,7 +1,7 @@
 /*
  * Nextcloud Talk - Android Client
  *
- * SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 Julius Linus <juliuslinus1@gmail.com>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 

app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt

@@ -277,7 +277,8 @@ interface NcApiCoroutines {
     suspend fun getContextOfChatMessage(
         @Header("Authorization") authorization: String,
         @Url url: String,
-        @Query("limit") limit: Int
+        @Query("limit") limit: Int,
+        @Query("threadId") threadId: Int?
     ): ChatOverall
 
     @GET

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -65,6 +65,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.ComposeView
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.core.content.PermissionChecker
 import androidx.core.content.PermissionChecker.PERMISSION_GRANTED
@@ -134,6 +135,8 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.chat.data.model.ChatMessage
 import com.nextcloud.talk.chat.viewmodels.ChatViewModel
 import com.nextcloud.talk.chat.viewmodels.MessageInputViewModel
+import com.nextcloud.talk.contextchat.ContextChatView
+import com.nextcloud.talk.contextchat.ContextChatViewModel
 import com.nextcloud.talk.conversationinfo.ConversationInfoActivity
 import com.nextcloud.talk.conversationinfo.viewmodel.ConversationInfoViewModel
 import com.nextcloud.talk.conversationlist.ConversationsListActivity
@@ -168,7 +171,6 @@ import com.nextcloud.talk.ui.PlaybackSpeed
 import com.nextcloud.talk.ui.PlaybackSpeedControl
 import com.nextcloud.talk.ui.StatusDrawable
 import com.nextcloud.talk.ui.bottom.sheet.ProfileBottomSheet
-import com.nextcloud.talk.ui.dialog.ContextChatCompose
 import com.nextcloud.talk.ui.dialog.DateTimeCompose
 import com.nextcloud.talk.ui.dialog.FileAttachmentPreviewFragment
 import com.nextcloud.talk.ui.dialog.MessageActionsDialog
@@ -246,7 +248,6 @@ import java.util.Locale
 import java.util.concurrent.ExecutionException
 import javax.inject.Inject
 import kotlin.math.roundToInt
-import androidx.core.content.ContextCompat
 
 @Suppress("TooManyFunctions")
 @AutoInjector(NextcloudTalkApplication::class)
@@ -287,6 +288,7 @@ class ChatActivity :
     lateinit var chatViewModel: ChatViewModel
 
     lateinit var conversationInfoViewModel: ConversationInfoViewModel
+    lateinit var contextChatViewModel: ContextChatViewModel
     lateinit var messageInputViewModel: MessageInputViewModel
 
     private var chatMenu: Menu? = null
@@ -323,28 +325,27 @@ class ChatActivity :
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
             executeIfResultOk(it) { intent ->
                 runBlocking {
-                    val id = intent?.getStringExtra(MessageSearchActivity.RESULT_KEY_MESSAGE_ID)
-                    id?.let {
-                        startContextChatWindowForMessage(id)
+                    val messageId = intent?.getStringExtra(MessageSearchActivity.RESULT_KEY_MESSAGE_ID)
+                    val threadId = intent?.getStringExtra(MessageSearchActivity.RESULT_KEY_THREAD_ID)
+                    messageId?.let {
+                        startContextChatWindowForMessage(messageId, threadId)
                     }
                 }
             }
         }
 
-    private fun startContextChatWindowForMessage(id: String?) {
+    private fun startContextChatWindowForMessage(messageId: String?, threadId: String?) {
         binding.genericComposeView.apply {
-            val shouldDismiss = mutableStateOf(false)
             setContent {
-                val bundle = bundleOf()
-                bundle.putString(BundleKeys.KEY_CREDENTIALS, credentials!!)
-                bundle.putString(BundleKeys.KEY_BASE_URL, conversationUser!!.baseUrl)
-                bundle.putString(KEY_ROOM_TOKEN, roomToken)
-                bundle.putString(BundleKeys.KEY_MESSAGE_ID, id)
-                bundle.putString(
-                    KEY_CONVERSATION_NAME,
-                    currentConversation!!.displayName
+                contextChatViewModel.getContextForChatMessages(
+                    credentials = credentials!!,
+                    baseUrl = conversationUser!!.baseUrl!!,
+                    token = roomToken,
+                    threadId = threadId,
+                    messageId = messageId!!,
+                    title = currentConversation!!.displayName
                 )
-                ContextChatCompose(bundle).GetDialogView(shouldDismiss, context)
+                ContextChatView(context, contextChatViewModel)
             }
         }
         Log.d(TAG, "Should open something else")
@@ -514,6 +515,8 @@ class ChatActivity :
 
         conversationInfoViewModel = ViewModelProvider(this, viewModelFactory)[ConversationInfoViewModel::class.java]
 
+        contextChatViewModel = ViewModelProvider(this, viewModelFactory)[ContextChatViewModel::class.java]
+
         val urlForChatting = ApiUtils.getUrlForChat(chatApiVersion, conversationUser?.baseUrl, roomToken)
         val credentials = ApiUtils.getCredentials(conversationUser!!.username, conversationUser!!.token)
         chatViewModel.initData(
@@ -4431,7 +4434,7 @@ class ChatActivity :
         }
         if (!foundMessage) {
             Log.d(TAG, "quoted message with id " + parentMessage.id + " was not found in adapter")
-            startContextChatWindowForMessage(parentMessage.id)
+            startContextChatWindowForMessage(parentMessage.id, conversationThreadId.toString())
         }
     }
 

app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt

@@ -1,7 +1,7 @@
 /*
  * Nextcloud Talk - Android Client
  *
- * SPDX-FileCopyrightText: 2024 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2025 Marcel Hibbe <dev@mhibbe.de>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 

app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt

@@ -74,7 +74,8 @@ interface ChatNetworkDataSource {
         baseUrl: String,
         token: String,
         messageId: String,
-        limit: Int
+        limit: Int,
+        threadId: Int?
     ): List<ChatMessageJson>
     suspend fun getOpenGraph(credentials: String, baseUrl: String, extractedLinkToPreview: String): Reference?
     suspend fun unbindRoom(credentials: String, baseUrl: String, roomToken: String): GenericOverall

app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt

@@ -198,10 +198,11 @@ class RetrofitChatNetwork(private val ncApi: NcApi, private val ncApiCoroutines:
         baseUrl: String,
         token: String,
         messageId: String,
-        limit: Int
+        limit: Int,
+        threadId: Int?
     ): List<ChatMessageJson> {
         val url = ApiUtils.getUrlForChatMessageContext(baseUrl, token, messageId)
-        return ncApiCoroutines.getContextOfChatMessage(credentials, url, limit).ocs?.data ?: listOf()
+        return ncApiCoroutines.getContextOfChatMessage(credentials, url, limit, threadId).ocs?.data ?: listOf()
     }
 
     override suspend fun getOpenGraph(

app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt

@@ -35,7 +35,6 @@ import com.nextcloud.talk.models.domain.ConversationModel
 import com.nextcloud.talk.models.domain.ReactionAddedModel
 import com.nextcloud.talk.models.domain.ReactionDeletedModel
 import com.nextcloud.talk.models.json.capabilities.SpreedCapability
-import com.nextcloud.talk.models.json.chat.ChatMessageJson
 import com.nextcloud.talk.models.json.chat.ChatOverallSingleMessage
 import com.nextcloud.talk.models.json.conversations.RoomOverall
 import com.nextcloud.talk.models.json.generic.GenericOverall
@@ -171,10 +170,6 @@ class ChatViewModel @Inject constructor(
     val voiceMessagePlaybackSpeedPreferences: LiveData<Map<String, PlaybackSpeed>>
         get() = _voiceMessagePlaybackSpeedPreferences
 
-    private val _getContextChatMessages: MutableLiveData<List<ChatMessageJson>> = MutableLiveData()
-    val getContextChatMessages: LiveData<List<ChatMessageJson>>
-        get() = _getContextChatMessages
-
     private val _threadRetrieveState = MutableStateFlow<ThreadRetrieveUiState>(ThreadRetrieveUiState.None)
     val threadRetrieveState: StateFlow<ThreadRetrieveUiState> = _threadRetrieveState
 
@@ -944,20 +939,6 @@ class ChatViewModel @Inject constructor(
         }
     }
 
-    fun getContextForChatMessages(credentials: String, baseUrl: String, token: String, messageId: String, limit: Int) {
-        viewModelScope.launch {
-            val messages = chatNetworkDataSource.getContextForChatMessage(
-                credentials,
-                baseUrl,
-                token,
-                messageId,
-                limit
-            )
-
-            _getContextChatMessages.value = messages
-        }
-    }
-
     fun getOpenGraph(credentials: String, baseUrl: String, urlToPreview: String) {
         viewModelScope.launch {
             _getOpenGraph.value = chatNetworkDataSource.getOpenGraph(credentials, baseUrl, urlToPreview)

app/src/main/java/com/nextcloud/talk/contacts/ContactsApplication.kt

@@ -1,7 +1,7 @@
 /*
  * Nextcloud Talk - Android Client
  *
- * SPDX-FileCopyrightText: 2024 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2024 Sowjanya Kota <sowjanya.kch@gmail.com>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */