merge conflicts

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>

Author: sowjanyakch

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

@@ -200,8 +200,7 @@ class ScheduledMessagesActivity : BaseActivity() {
                             openThread(threadId)
                         },
                         threadTitle = threadTitle,
-                        isThreadView = isThreadView
-                        },
+                        isThreadView = isThreadView,
                         onCopyScheduledMessage = { message ->
                             copyScheduledMessage(message)
                         }
@@ -451,11 +450,6 @@ class ScheduledMessagesActivity : BaseActivity() {
                         }
 
                         if (visibleMessages.isEmpty()) {
-                        val linkPreviews by scheduledMessagesViewModel
-                            .linkPreviews
-                            .collectAsStateWithLifecycle()
-
-                        if (state.messages.isEmpty()) {
                             Box(
                                 modifier = Modifier.fillMaxSize(),
                                 contentAlignment = Alignment.Center
@@ -528,8 +522,6 @@ class ScheduledMessagesActivity : BaseActivity() {
                                             null
                                         }
 
-                                        val parentMessage = parentId?.let { parentMessages[it] }
-
                                         val linkPreview = message.token?.let { linkPreviews[it] }
                                         ScheduledMessageBubble(
                                             message = message,
@@ -870,6 +862,11 @@ class ScheduledMessagesActivity : BaseActivity() {
                                 AndroidView(
                                     factory = { androidContext ->
                                         TextView(androidContext).apply {
+                                            setOnClickListener {
+                                                if (isClickable) {
+                                                    onClick()
+                                                }
+                                            }
                                             setOnLongClickListener {
                                                 onLongPress()
                                                 true