feat(chat): Re-add mark message as read

Resolves #6058

AI-assistant: Claude Code v2.1.117 (Claude Sonnet 4.6)
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Author: AndyScherzinger

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

@@ -3451,21 +3451,27 @@ class ChatActivity :
         )
     }
 
-    fun markAsUnread(chatMessage: ChatMessage?) {
-        if (chatMessage!!.previousMessageId > NO_PREVIOUS_MESSAGE_ID) {
-            // previousMessageId is taken to mark chat as unread even when "chat-unread" capability is not available
-            // It should be checked if "chat-unread" capability is available and then use
-            // https://nextcloud-talk.readthedocs.io/en/latest/chat/#mark-chat-as-unread
-            chatViewModel.setChatReadMessage(
-                credentials!!,
-                ApiUtils.getUrlForChatReadMarker(
-                    ApiUtils.getChatApiVersion(spreedCapabilities, intArrayOf(ApiUtils.API_V1)),
-                    conversationUser?.baseUrl!!,
-                    roomToken
-                ),
-                chatMessage.previousMessageId
-            )
+    fun markAsUnread(chatMessage: ChatMessage) {
+        val items = chatViewModel.uiState.value.items
+        val selectedIndex = items.indexOfFirst {
+            (it as? ChatViewModel.ChatItem.MessageItem)?.uiMessage?.id == chatMessage.jsonMessageId
+        }
+        val lastReadMessage = if (selectedIndex in 0 until items.size - 1) {
+            (selectedIndex + 1 until items.size)
+                .firstNotNullOfOrNull { (items[it] as? ChatViewModel.ChatItem.MessageItem)?.uiMessage?.id }
+                ?: 0
+        } else {
+            0
         }
+        chatViewModel.setChatReadMessage(
+            credentials!!,
+            ApiUtils.getUrlForChatReadMarker(
+                ApiUtils.getChatApiVersion(spreedCapabilities, intArrayOf(ApiUtils.API_V1)),
+                conversationUser.baseUrl!!,
+                roomToken
+            ),
+            lastReadMessage
+        )
     }
 
     fun copyMessage(message: ChatMessage?) {
@@ -3712,10 +3718,7 @@ class ChatActivity :
             // delete
             ChatMessage.MessageType.REGULAR_TEXT_MESSAGE == message.getCalculateMessageType() ||
             // forward
-            message.previousMessageId > NO_PREVIOUS_MESSAGE_ID &&
-            // mark as unread
-            ChatMessage.MessageType.SYSTEM_MESSAGE != message.getCalculateMessageType() &&
-            BuildConfig.DEBUG
+            ChatMessage.MessageType.SYSTEM_MESSAGE != message.getCalculateMessageType()
 
     private fun isShowMessageDeletionButton(message: ChatMessage): Boolean {
         val isUserAllowedByPrivileges = userAllowedByPrivilages(message)
@@ -3975,7 +3978,6 @@ class ChatActivity :
         private const val FULLY_OPAQUE_INT: Int = 255
         private const val SEMI_TRANSPARENT_INT: Int = 99
         private const val VOICE_MESSAGE_SEEKBAR_BASE = 1000
-        private const val NO_PREVIOUS_MESSAGE_ID: Int = -1
         private const val TOOLBAR_AVATAR_RATIO = 1.5
         private const val STATUS_SIZE_IN_DP = 9f
         private const val HTTP_BAD_REQUEST = 400

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

@@ -133,6 +133,8 @@ interface ChatMessageRepository : LifecycleAwareManager {
 
     suspend fun hidePinnedMessage(credentials: String, url: String): Flow<Boolean>
 
+    suspend fun markChatAsUnread(credentials: String, url: String): Flow<Boolean>
+
     @Suppress("LongParameterList")
     suspend fun sendScheduledChatMessage(
         credentials: String,

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

@@ -116,4 +116,6 @@ interface ChatNetworkDataSource {
     suspend fun unPinMessage(credentials: String, url: String): ChatOverallSingleMessage
 
     suspend fun hidePinnedMessage(credentials: String, url: String): GenericOverall
+
+    suspend fun markChatAsUnread(credentials: String, url: String): GenericOverall
 }

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

@@ -954,6 +954,16 @@ class OfflineFirstChatRepository @Inject constructor(
             }
         }
 
+    override suspend fun markChatAsUnread(credentials: String, url: String): Flow<Boolean> =
+        flow {
+            runCatching {
+                network.markChatAsUnread(credentials, url)
+                emit(true)
+            }.getOrElse { throwable ->
+                Log.e(TAG, "Error in markChatAsUnread: $throwable")
+            }
+        }
+
     override suspend fun onSignalingChatMessageReceived(chatMessages: List<ChatMessageJson>) {
         persistChatMessagesAndHandleSystemMessages(chatMessages, emitOnIncoming = true)
 

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

@@ -285,4 +285,7 @@ class RetrofitChatNetwork(private val ncApi: NcApi, private val ncApiCoroutines:
 
     override suspend fun hidePinnedMessage(credentials: String, url: String): GenericOverall =
         ncApiCoroutines.hidePinnedMessage(credentials, url)
+
+    override suspend fun markChatAsUnread(credentials: String, url: String): GenericOverall =
+        ncApiCoroutines.markRoomAsUnread(credentials, url)
 }

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

@@ -1756,6 +1756,12 @@ class ChatViewModel @AssistedInject constructor(
         }
     }
 
+    fun markChatAsUnread(credentials: String, url: String) {
+        viewModelScope.launch {
+            chatRepository.markChatAsUnread(credentials, url).collect {}
+        }
+    }
+
     fun refreshRoom() {
         viewModelScope.launch {
             getRoom(chatRoomToken)

app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt

@@ -175,7 +175,7 @@ class MessageActionsDialog(
                     canPin
             )
             initMenuMarkAsUnread(
-                message.previousMessageId > NO_PREVIOUS_MESSAGE_ID &&
+                hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.CHAT_READ_MARKER) &&
                     ChatMessage.MessageType.SYSTEM_MESSAGE != message.getCalculateMessageType() &&
                     isOnline
             )
@@ -638,7 +638,6 @@ class MessageActionsDialog(
     companion object {
         private val TAG = MessageActionsDialog::class.java.simpleName
         private const val ACTOR_LENGTH = 6
-        private const val NO_PREVIOUS_MESSAGE_ID: Int = -1
         private const val DELAY: Long = 200
         private const val AGE_THRESHOLD_FOR_EDIT_MESSAGE: Long = 86400000
         private const val ACTOR_BOTS = "bots"