Skip to content

Commit a656513

Browse files
committed
clicking on scheduled thread message scrolls to thread
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
1 parent 00268ee commit a656513

1 file changed

Lines changed: 22 additions & 7 deletions

File tree

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -538,11 +538,18 @@ class ScheduledMessagesActivity : BaseActivity() {
538538
dateUtils = dateUtils,
539539
viewThemeUtils = viewThemeUtils,
540540
onClick = {
541-
if (isThreadView) {
541+
val parentId = message.parentMessageId
542+
val isThreadMessage = (message.threadId ?: 0L) > 0
543+
544+
if (isThreadMessage && !isThreadView) {
542545
return@ScheduledMessageBubble
543546
}
544-
val parentId = message.parentMessageId
545-
if (parentId != null) {
547+
548+
if (isThreadView && parentId != null) {
549+
openThreadParentMessage(parentId, message.threadId)
550+
}
551+
552+
if (parentId != null && !isThreadView) {
546553
onOpenParentMessage(parentId)
547554
}
548555
},
@@ -779,10 +786,9 @@ class ScheduledMessagesActivity : BaseActivity() {
779786

780787
val isClickable = remember(message.threadTitle, parentMessage, message.threadId, isThreadView) {
781788
val isThreadMessage = (message.threadId ?: 0L) > 0
782-
if (isThreadMessage) {
783-
false
784-
} else {
785-
(!isThreadView && !message.threadTitle.isNullOrBlank()) || parentMessage != null
789+
when {
790+
isThreadMessage -> isThreadView
791+
else -> !message.threadTitle.isNullOrBlank() || parentMessage != null
786792
}
787793
}
788794

@@ -1193,6 +1199,15 @@ class ScheduledMessagesActivity : BaseActivity() {
11931199
startActivity(intent)
11941200
}
11951201

1202+
private fun openThreadParentMessage(messageId: Long?, threadId: Long?) {
1203+
val intent = Intent(this, ChatActivity::class.java).apply {
1204+
putExtra(KEY_ROOM_TOKEN, roomToken)
1205+
threadId?.let { putExtra(BundleKeys.KEY_THREAD_ID, it) }
1206+
messageId?.let { putExtra(BundleKeys.KEY_MESSAGE_ID, it.toString()) }
1207+
}
1208+
startActivity(intent)
1209+
}
1210+
11961211
@Composable
11971212
private fun ActionRow(icon: ImageVector, text: String, onClick: () -> Unit) {
11981213
TextButton(

0 commit comments

Comments
 (0)