fix after merge conflict + format code

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

Author: mahibi

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

@@ -112,14 +112,14 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
         clickView = image
         messageText.visibility = View.VISIBLE
         if (message.getCalculateMessageType() === ChatMessage.MessageType.SINGLE_NC_ATTACHMENT_MESSAGE) {
-            message.activeUser?.let{
+            message.activeUser?.let {
                 fileViewerUtils = FileViewerUtils(context!!, it)
                 val fileName = message.selectedIndividualHashMap!![KEY_NAME]
                 messageText.text = fileName
                 if (
                     it.username != null &&
                     it.baseUrl != null
-                    ) {
+                ) {
                     clickView!!.setOnClickListener { v: View? ->
                         fileViewerUtils!!.openFile(
                             message,
@@ -142,7 +142,6 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
             } ?: {
                 Log.e(TAG, "failed to set click listener because activeUser, username or baseUrl were null")
             }
-
         } else if (message.getCalculateMessageType() === ChatMessage.MessageType.SINGLE_LINK_GIPHY_MESSAGE) {
             messageText.text = "GIPHY"
             DisplayUtils.setClickableString("GIPHY", "https://giphy.com", messageText)

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

@@ -1022,13 +1022,15 @@ class ChatActivity :
                         binding.offline.root.visibility = View.GONE
                         binding.messagesListView.visibility = View.VISIBLE
 
-
                         lifecycleScope.launch {
                             repeatOnLifecycle(Lifecycle.State.STARTED) {
                                 chatViewModel.observeMessages()
                                     .collect { messages ->
-                                        Log.d("newchat", "messages.size when colleting in ChatActivity:" + messages
-                                            .size)
+                                        Log.d(
+                                            "newchat",
+                                            "messages.size when colleting in ChatActivity:" + messages
+                                                .size
+                                        )
 
                                         val transformedMessages = messages
                                             .let(::handleSystemMessages)
@@ -1060,7 +1062,6 @@ class ChatActivity :
                                     }
                             }
                         }
-
                     }
                     else -> {}
                 }
@@ -1345,160 +1346,6 @@ class ChatActivity :
         }
     }
 
-    @Composable
-    private fun PinnedMessageView(message: ChatMessage) {
-        message.incoming = true
-
-        val pinnedBy = stringResource(R.string.pinned_by)
-
-        message.actorDisplayName = remember(message.pinnedActorDisplayName) {
-            "${message.actorDisplayName}\n$pinnedBy ${message.pinnedActorDisplayName}"
-        }
-        val scrollState = rememberScrollState()
-
-        val outgoingBubbleColor = remember {
-            val colorInt = viewThemeUtils.talk
-                .getOutgoingMessageBubbleColor(context, message.isDeleted, false)
-
-            Color(colorInt)
-        }
-
-        val incomingBubbleColor = remember {
-            val colorInt = resources
-                .getColor(R.color.bg_message_list_incoming_bubble, null)
-
-            Color(colorInt)
-        }
-
-        val canPin = remember {
-            message.isOneToOneConversation ||
-                ConversationUtils.isParticipantOwnerOrModerator(currentConversation!!)
-        }
-
-        Column(
-            verticalArrangement = Arrangement.spacedBy((-16).dp),
-            modifier = Modifier
-        ) {
-            Box(
-                modifier = Modifier
-                    .shadow(4.dp, shape = RoundedCornerShape(16.dp))
-                    .background(incomingBubbleColor, RoundedCornerShape(16.dp))
-                    .padding(16.dp)
-                    .heightIn(max = 100.dp)
-                    .verticalScroll(scrollState)
-                    .clickable {
-                        scrollToMessageWithIdWithOffset(message.id)
-                    }
-
-            ) {
-                ComposeChatAdapter().GetComposableForMessage(message)
-            }
-
-            var expanded by remember { mutableStateOf(false) }
-
-            val pinnedText = remember(message.pinnedUntil) {
-                val pinnedUntilStr = context.getString(R.string.pinned_until)
-                val untilUnpin = context.getString(R.string.until_unpin)
-
-                message.pinnedUntil?.let {
-                    val format = if (DateFormat.is24HourFormat(context)) {
-                        "MMM dd yyyy, HH:mm"
-                    } else {
-                        "MMM dd yyyy, hh:mm a"
-                    }
-
-                    val localDateTime = Instant.ofEpochSecond(it)
-                        .atZone(ZoneId.systemDefault())
-                        .toLocalDateTime()
-
-                    val timeString = localDateTime.format(DateTimeFormatter.ofPattern(format))
-
-                    "$pinnedUntilStr $timeString"
-                } ?: untilUnpin
-            }
-
-            Box(
-                modifier = Modifier
-                    .offset(16.dp, 0.dp)
-                    .background(outgoingBubbleColor, RoundedCornerShape(16.dp))
-            ) {
-                IconButton(onClick = { expanded = true }) {
-                    Icon(
-                        imageVector = Icons.Default.Menu, // Or use a Pin icon here
-                        contentDescription = "Pinned Message Options"
-                    )
-                }
-
-                DropdownMenu(
-                    expanded = expanded,
-                    onDismissRequest = { expanded = false },
-                    modifier = Modifier.background(outgoingBubbleColor)
-                ) {
-                    DropdownMenuItem(
-                        text = {
-                            Text(
-                                text = pinnedText,
-                                style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
-                            )
-                        },
-                        onClick = { /* No-op or toggle expansion */ },
-                        enabled = false // Visually distinct as information, not action
-                    )
-
-                    Divider()
-
-                    DropdownMenuItem(
-                        text = { Text("Go to message") },
-                        leadingIcon = {
-                            Icon(
-                                painter = painterResource(R.drawable.baseline_chat_bubble_outline_24),
-                                contentDescription = null,
-                                modifier = Modifier.size(24.dp)
-                            )
-                        },
-                        onClick = {
-                            expanded = false
-                            scrollToMessageWithIdWithOffset(message.id)
-                        }
-                    )
-
-                    DropdownMenuItem(
-                        text = { Text("Dismiss") },
-                        leadingIcon = {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_eye_off),
-                                contentDescription = null,
-                                modifier = Modifier.size(24.dp)
-                            )
-                        },
-                        onClick = {
-                            expanded = false
-                            hidePinnedMessage(message)
-                        }
-                    )
-
-                    if (canPin) {
-                        DropdownMenuItem(
-                            text = { Text("Unpin") },
-                            leadingIcon = {
-                                Icon(
-                                    painter = painterResource(R.drawable.keep_off_24px),
-                                    contentDescription = null,
-                                    modifier = Modifier.size(24.dp)
-                                )
-                            },
-                            onClick = {
-                                expanded = false
-                                unPinMessage(message)
-                            }
-                        )
-                    }
-                }
-            }
-        }
-    }
-
     private fun removeUnreadMessagesMarker() {
         removeMessageById(UNREAD_MESSAGES_MARKER_ID.toString())
     }
@@ -3359,7 +3206,7 @@ class ChatActivity :
         }
     }
 
-    private fun determinePreviousMessageIds(chatMessageList: List<ChatMessage>) : List<ChatMessage> {
+    private fun determinePreviousMessageIds(chatMessageList: List<ChatMessage>): List<ChatMessage> {
         var previousMessageId = NO_PREVIOUS_MESSAGE_ID
         for (i in chatMessageList.indices.reversed()) {
             val chatMessage = chatMessageList[i]
@@ -3932,7 +3779,6 @@ class ChatActivity :
                 (message2.lastEditTimestamp == 0L || message1.lastEditTimestamp == 0L)
         }
 
-
         for (i in chatMessageList.indices) {
             if (chatMessageList.size > i + 1) {
                 chatMessageList[i].isGrouped = groupMessages(chatMessageList[i], chatMessageList[i + 1])

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

@@ -53,9 +53,7 @@ interface ChatMessageRepository : LifecycleAwareManager {
 
     suspend fun loadInitialMessages(withNetworkParams: Bundle, hasHighPerformanceBackend: Boolean)
 
-    fun startRegularMessagePolling(
-        hasHighPerformanceBackend: Boolean
-    ): Flow<Unit>
+    fun startRegularMessagePolling(hasHighPerformanceBackend: Boolean): Flow<Unit>
 
     /**
      * Loads messages from local storage. If the messages are not found, then it

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

@@ -209,11 +209,13 @@ data class ChatMessage(
 
     @Suppress("ReturnCount")
     fun isLinkPreview(): Boolean {
-        activeUser?.let{
+        activeUser?.let {
             if (CapabilitiesUtil.isLinkPreviewAvailable(it)) {
                 val regexStringFromServer = activeUser?.capabilities?.coreCapability?.referenceRegex
 
-                val regexFromServer = regexStringFromServer?.toRegex(setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE))
+                val regexFromServer = regexStringFromServer?.toRegex(
+                    setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE)
+                )
                 val regexDefault = REGEX_STRING_DEFAULT.toRegex(setOf(RegexOption.MULTILINE, RegexOption.IGNORE_CASE))
 
                 val messageCharSequence: CharSequence = StringBuffer(message!!)