Message threads

app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt

@@ -52,7 +52,8 @@ class ChatBlocksDaoTest {
     @Test
     fun testGetConnectedChatBlocks() =
         runTest {
-            usersDao.saveUser(createUserEntity("account1", "Account 1"))
+            val user = createUserEntity("account1", "Account 1")
+            usersDao.saveUser(user)
             val account1 = usersDao.getUserWithUserId("account1").blockingGet()
 
             conversationsDao.upsertConversations(
@@ -77,6 +78,7 @@ class ChatBlocksDaoTest {
                 internalConversationId = conversation1.internalId,
                 accountId = conversation1.accountId,
                 token = conversation1.token,
+                threadId = null,
                 oldestMessageId = 50,
                 newestMessageId = 60,
                 hasHistory = true
@@ -86,6 +88,7 @@ class ChatBlocksDaoTest {
                 internalConversationId = conversation1.internalId,
                 accountId = conversation1.accountId,
                 token = conversation1.token,
+                threadId = null,
                 oldestMessageId = 10,
                 newestMessageId = 20,
                 hasHistory = true
@@ -95,6 +98,7 @@ class ChatBlocksDaoTest {
                 internalConversationId = conversation1.internalId,
                 accountId = conversation1.accountId,
                 token = conversation1.token,
+                threadId = null,
                 oldestMessageId = 45,
                 newestMessageId = 55,
                 hasHistory = true
@@ -104,6 +108,7 @@ class ChatBlocksDaoTest {
                 internalConversationId = conversation1.internalId,
                 accountId = conversation1.accountId,
                 token = conversation1.token,
+                threadId = null,
                 oldestMessageId = 52,
                 newestMessageId = 58,
                 hasHistory = true
@@ -113,6 +118,7 @@ class ChatBlocksDaoTest {
                 internalConversationId = conversation1.internalId,
                 accountId = conversation1.accountId,
                 token = conversation1.token,
+                threadId = null,
                 oldestMessageId = 1,
                 newestMessageId = 99,
                 hasHistory = true
@@ -122,6 +128,7 @@ class ChatBlocksDaoTest {
                 internalConversationId = conversation1.internalId,
                 accountId = conversation1.accountId,
                 token = conversation1.token,
+                threadId = null,
                 oldestMessageId = 59,
                 newestMessageId = 70,
                 hasHistory = true
@@ -131,6 +138,7 @@ class ChatBlocksDaoTest {
                 internalConversationId = conversation1.internalId,
                 accountId = conversation1.accountId,
                 token = conversation1.token,
+                threadId = null,
                 oldestMessageId = 80,
                 newestMessageId = 90,
                 hasHistory = true
@@ -140,6 +148,7 @@ class ChatBlocksDaoTest {
                 internalConversationId = conversation2.internalId,
                 accountId = conversation2.accountId,
                 token = conversation2.token,
+                threadId = null,
                 oldestMessageId = 53,
                 newestMessageId = 57,
                 hasHistory = true
@@ -156,14 +165,93 @@ class ChatBlocksDaoTest {
             chatBlocksDao.upsertChatBlock(chatBlockWithinButOtherConversation)
 
             val results = chatBlocksDao.getConnectedChatBlocks(
-                conversation1.internalId,
-                searchedChatBlock.oldestMessageId,
-                searchedChatBlock.newestMessageId
+                internalConversationId = conversation1.internalId,
+                threadId = null,
+                oldestMessageId = searchedChatBlock.oldestMessageId,
+                newestMessageId = searchedChatBlock.newestMessageId
             )
 
             assertEquals(5, results.first().size)
         }
 
+    @Test
+    fun testGetConnectedChatBlocksWithThreadsScenario() =
+        runTest {
+            val user = createUserEntity("account1", "Account 1")
+            usersDao.saveUser(user)
+            val account1 = usersDao.getUserWithUserId("account1").blockingGet()
+
+            conversationsDao.upsertConversations(
+                listOf(
+                    createConversationEntity(
+                        accountId = account1.id,
+                        "abc",
+                        roomName = "Conversation One"
+                    ),
+                    createConversationEntity(
+                        accountId = account1.id,
+                        "def",
+                        roomName = "Conversation Two"
+                    )
+                )
+            )
+
+            val conversation1 = conversationsDao.getConversationsForUser(account1.id).first()[0]
+
+            val searchedChatBlock = ChatBlockEntity(
+                internalConversationId = conversation1.internalId,
+                accountId = conversation1.accountId,
+                token = conversation1.token,
+                threadId = 123,
+                oldestMessageId = 50,
+                newestMessageId = 60,
+                hasHistory = true
+            )
+
+            val chatBlockOverlap1 = ChatBlockEntity(
+                internalConversationId = conversation1.internalId,
+                accountId = conversation1.accountId,
+                token = conversation1.token,
+                threadId = null,
+                oldestMessageId = 45,
+                newestMessageId = 55,
+                hasHistory = true
+            )
+
+            val chatBlockOverlap2 = ChatBlockEntity(
+                internalConversationId = conversation1.internalId,
+                accountId = conversation1.accountId,
+                token = conversation1.token,
+                threadId = 123,
+                oldestMessageId = 59,
+                newestMessageId = 70,
+                hasHistory = true
+            )
+
+            chatBlocksDao.upsertChatBlock(searchedChatBlock)
+
+            chatBlocksDao.upsertChatBlock(chatBlockOverlap1)
+            chatBlocksDao.upsertChatBlock(chatBlockOverlap2)
+
+            val resultsForThreadIdNull = chatBlocksDao.getConnectedChatBlocks(
+                internalConversationId = conversation1.internalId,
+                threadId = null,
+                oldestMessageId = searchedChatBlock.oldestMessageId,
+                newestMessageId = searchedChatBlock.newestMessageId
+            )
+
+            assertEquals(1, resultsForThreadIdNull.first().size)
+
+            val resultsForThreadId123 = chatBlocksDao.getConnectedChatBlocks(
+                internalConversationId = conversation1.internalId,
+                threadId = 123,
+                oldestMessageId = searchedChatBlock.oldestMessageId,
+                newestMessageId = searchedChatBlock.newestMessageId
+            )
+
+            assertEquals(2, resultsForThreadId123.first().size)
+        }
+
     private fun createUserEntity(userId: String, userName: String) =
         UserEntity(
             userId = userId,

app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatMessagesDaoTest.kt

@@ -140,7 +140,11 @@ class ChatMessagesDaoTest {
             assertEquals("are", conv1chatMessage3.message)
 
             val chatMessagesConv1Since =
-                chatMessagesDao.getMessagesForConversationSince(conversation1.internalId, conv1chatMessage3.id)
+                chatMessagesDao.getMessagesForConversationSince(
+                    conversation1.internalId,
+                    conv1chatMessage3.id,
+                    null
+                )
             assertEquals(3, chatMessagesConv1Since.first().size)
             assertEquals("are", chatMessagesConv1Since.first()[0].message)
             assertEquals("some", chatMessagesConv1Since.first()[1].message)
@@ -150,7 +154,8 @@ class ChatMessagesDaoTest {
                 chatMessagesDao.getMessagesForConversationBeforeAndEqual(
                     conversation1.internalId,
                     conv1chatMessage3.id,
-                    3
+                    3,
+                    null
                 )
             assertEquals(3, chatMessagesConv1To.first().size)
             assertEquals("hello", chatMessagesConv1To.first()[2].message)

app/src/main/AndroidManifest.xml

@@ -258,6 +258,10 @@
             android:name=".lock.LockedActivity"
             android:theme="@style/AppTheme" />
 
+        <activity
+            android:name=".threadsoverview.ThreadsOverviewActivity"
+            android:theme="@style/AppTheme" />
+
         <receiver
             android:name=".receivers.PackageReplacedReceiver"
             android:exported="false">

app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt

@@ -146,6 +146,9 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
             }
             binding.messageText.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
             binding.messageText.text = processedMessageText
+            // just for debugging:
+            // binding.messageText.text =
+            //     SpannableStringBuilder(processedMessageText).append(" (" + message.jsonMessageId + ")")
         } else {
             binding.messageText.visibility = View.GONE
             binding.checkboxContainer.visibility = View.VISIBLE
@@ -159,12 +162,23 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
             binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.timestamp)
         }
         viewThemeUtils.platform.colorTextView(binding.messageTime, ColorRole.ON_SURFACE_VARIANT)
+
         // parent message handling
-        if (!message.isDeleted && message.parentMessageId != null) {
-            processParentMessage(message)
-            binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE
-        } else {
-            binding.messageQuote.quotedChatMessageView.visibility = View.GONE
+        val chatActivity = commonMessageInterface as ChatActivity
+        binding.messageQuote.quotedChatMessageView.visibility =
+            if (!message.isDeleted &&
+                message.parentMessageId != null &&
+                message.parentMessageId != chatActivity.threadId
+            ) {
+                processParentMessage(message)
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+
+        binding.messageQuote.quotedChatMessageView.setOnLongClickListener { l: View? ->
+            commonMessageInterface.onOpenMessageActionsDialog(message)
+            true
         }
 
         itemView.setTag(R.string.replyable_message_view_tag, message.replyable)

app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt

@@ -160,6 +160,9 @@ class OutcomingTextMessageViewHolder(itemView: View) :
             binding.messageTime.layoutParams = layoutParams
             viewThemeUtils.platform.colorTextView(binding.messageText, ColorRole.ON_SURFACE_VARIANT)
             binding.messageText.text = processedMessageText
+            // just for debugging:
+            // binding.messageText.text =
+            //     SpannableStringBuilder(processedMessageText).append(" (" + message.jsonMessageId + ")")
         } else {
             binding.messageText.visibility = View.GONE
             binding.checkboxContainer.visibility = View.VISIBLE
@@ -174,12 +177,23 @@ class OutcomingTextMessageViewHolder(itemView: View) :
         }
         viewThemeUtils.platform.colorTextView(binding.messageTime, ColorRole.ON_SURFACE_VARIANT)
         setBubbleOnChatMessage(message)
+
         // parent message handling
-        if (!message.isDeleted && message.parentMessageId != null) {
-            processParentMessage(message)
-            binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE
-        } else {
-            binding.messageQuote.quotedChatMessageView.visibility = View.GONE
+        val chatActivity = commonMessageInterface as ChatActivity
+        binding.messageQuote.quotedChatMessageView.visibility =
+            if (!message.isDeleted &&
+                message.parentMessageId != null &&
+                message.parentMessageId != chatActivity.threadId
+            ) {
+                processParentMessage(message)
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+
+        binding.messageQuote.quotedChatMessageView.setOnLongClickListener { l: View? ->
+            commonMessageInterface.onOpenMessageActionsDialog(message)
+            true
         }
 
         binding.checkMark.visibility = View.INVISIBLE
@@ -195,8 +209,6 @@ class OutcomingTextMessageViewHolder(itemView: View) :
             updateStatus(R.drawable.ic_check, context.resources?.getString(R.string.nc_message_sent))
         }
 
-        val chatActivity = commonMessageInterface as ChatActivity
-
         chatActivity.lifecycleScope.launch {
             if (message.isTemporary && !networkMonitor.isOnline.value) {
                 updateStatus(

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

@@ -19,6 +19,8 @@ import com.nextcloud.talk.models.json.participants.TalkBan
 import com.nextcloud.talk.models.json.participants.TalkBanOverall
 import com.nextcloud.talk.models.json.profile.ProfileOverall
 import com.nextcloud.talk.models.json.testNotification.TestNotificationOverall
+import com.nextcloud.talk.models.json.threads.ThreadOverall
+import com.nextcloud.talk.models.json.threads.ThreadsOverall
 import com.nextcloud.talk.models.json.userAbsence.UserAbsenceOverall
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
@@ -285,4 +287,13 @@ interface NcApiCoroutines {
 
     @DELETE
     suspend fun unbindRoom(@Header("Authorization") authorization: String, @Url url: String): GenericOverall
+
+    @POST
+    suspend fun createThread(@Header("Authorization") authorization: String, @Url url: String): ThreadOverall
+
+    @GET
+    suspend fun getThreads(@Header("Authorization") authorization: String, @Url url: String): ThreadsOverall
+
+    @GET
+    suspend fun getThread(@Header("Authorization") authorization: String, @Url url: String): ThreadOverall
 }