Merge remote-tracking branch 'upstream/dev' into disappearing-messages

# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/res/layout/activity_conversation_v2_action_bar.xml
2025-08-11 17:48:23 +00:00 · 2023-07-26 09:46:57 +10:00
parent 57d43270a8 d39cf2754c
commit 7f7971e47f
59 changed files with 1224 additions and 293 deletions
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
@@ -286,10 +286,9 @@ class BatchMessageReceiveJob(
            val openGroupID = data.getStringOrDefault(OPEN_GROUP_ID_KEY, null)

            val parameters = (0 until numMessages).map { index ->
-                val data = contents[index]
                val serverHash = serverHashes[index].let { if (it.isEmpty()) null else it }
                val serverId = openGroupMessageServerIDs[index].let { if (it == -1L) null else it }
-                MessageReceiveParameters(data, serverHash, serverId)
+                MessageReceiveParameters(contents[index], serverHash, serverId)
            }

            return BatchMessageReceiveJob(parameters, openGroupID)
--- a/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
@@ -2,6 +2,7 @@ package org.session.libsession.messaging.mentions

 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.contacts.Contact
+import java.util.*

 object MentionsManager {
    var userPublicKeyCache = mutableMapOf<Long, Set<String>>() // Thread ID to set of user hex encoded public keys
@@ -32,9 +33,9 @@ object MentionsManager {
        candidates.sortedBy { it.displayName }
        if (query.length >= 2) {
            // Filter out any non-matching candidates
-            candidates = candidates.filter { it.displayName.toLowerCase().contains(query.toLowerCase()) }
+            candidates = candidates.filter { it.displayName.lowercase(Locale.getDefault()).contains(query.lowercase(Locale.getDefault())) }
            // Sort based on where in the candidate the query occurs
-            candidates.sortedBy { it.displayName.toLowerCase().indexOf(query.toLowerCase()) }
+            candidates.sortedBy { it.displayName.lowercase(Locale.getDefault()).indexOf(query.lowercase(Locale.getDefault())) }
        }
        // Return
        return candidates
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
@@ -4,6 +4,10 @@ import android.content.Context
 import org.session.libsession.R
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.calls.CallMessageType
+import org.session.libsession.messaging.calls.CallMessageType.CALL_FIRST_MISSED
+import org.session.libsession.messaging.calls.CallMessageType.CALL_INCOMING
+import org.session.libsession.messaging.calls.CallMessageType.CALL_MISSED
+import org.session.libsession.messaging.calls.CallMessageType.CALL_OUTGOING
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.messages.ExpirationConfiguration
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
@@ -13,46 +17,41 @@ import org.session.libsession.utilities.truncateIdForDisplay
 import org.session.libsignal.protos.SignalServiceProtos.Content.ExpirationType

 object UpdateMessageBuilder {
+    val storage = MessagingModuleConfiguration.shared.storage
+
+    fun getSenderName(senderId: String) = storage.getContactWithSessionID(senderId)
+        ?.displayName(Contact.ContactContext.REGULAR)
+        ?: truncateIdForDisplay(senderId)

    fun buildGroupUpdateMessage(context: Context, updateMessageData: UpdateMessageData, senderId: String? = null, isOutgoing: Boolean = false): String {
-        var message = ""
-        val updateData = updateMessageData.kind ?: return message
-        if (!isOutgoing && senderId == null) return message
-        val storage = MessagingModuleConfiguration.shared.storage
-        val senderName: String = if (!isOutgoing) {
-            storage.getContactWithSessionID(senderId!!)?.displayName(Contact.ContactContext.REGULAR) ?: truncateIdForDisplay(senderId)
-        } else { context.getString(R.string.MessageRecord_you) }
+        val updateData = updateMessageData.kind
+        if (updateData == null || !isOutgoing && senderId == null) return ""
+        val senderName: String = if (isOutgoing) context.getString(R.string.MessageRecord_you)
+        else getSenderName(senderId!!)

-        when (updateData) {
-            is UpdateMessageData.Kind.GroupCreation -> {
-                message = if (isOutgoing) {
-                    context.getString(R.string.MessageRecord_you_created_a_new_group)
-                } else {
-                    context.getString(R.string.MessageRecord_s_added_you_to_the_group, senderName)
-                }
+        return when (updateData) {
+            is UpdateMessageData.Kind.GroupCreation -> if (isOutgoing) {
+                context.getString(R.string.MessageRecord_you_created_a_new_group)
+            } else {
+                context.getString(R.string.MessageRecord_s_added_you_to_the_group, senderName)
            }
-            is UpdateMessageData.Kind.GroupNameChange -> {
-                message = if (isOutgoing) {
-                    context.getString(R.string.MessageRecord_you_renamed_the_group_to_s, updateData.name)
-                } else {
-                    context.getString(R.string.MessageRecord_s_renamed_the_group_to_s, senderName, updateData.name)
-                }
+            is UpdateMessageData.Kind.GroupNameChange -> if (isOutgoing) {
+                context.getString(R.string.MessageRecord_you_renamed_the_group_to_s, updateData.name)
+            } else {
+                context.getString(R.string.MessageRecord_s_renamed_the_group_to_s, senderName, updateData.name)
            }
            is UpdateMessageData.Kind.GroupMemberAdded -> {
-                val members = updateData.updatedMembers.joinToString(", ") {
-                    storage.getContactWithSessionID(it)?.displayName(Contact.ContactContext.REGULAR) ?: it
-                }
-                message = if (isOutgoing) {
+                val members = updateData.updatedMembers.joinToString(", ", transform = ::getSenderName)
+                if (isOutgoing) {
                    context.getString(R.string.MessageRecord_you_added_s_to_the_group, members)
                } else {
                    context.getString(R.string.MessageRecord_s_added_s_to_the_group, senderName, members)
                }
            }
            is UpdateMessageData.Kind.GroupMemberRemoved -> {
-                val storage = MessagingModuleConfiguration.shared.storage
                val userPublicKey = storage.getUserPublicKey()!!
                // 1st case: you are part of the removed members
-                message = if (userPublicKey in updateData.updatedMembers) {
+                return if (userPublicKey in updateData.updatedMembers) {
                    if (isOutgoing) {
                        context.getString(R.string.MessageRecord_left_group)
                    } else {
@@ -60,9 +59,7 @@ object UpdateMessageBuilder {
                    }
                } else {
                    // 2nd case: you are not part of the removed members
-                    val members = updateData.updatedMembers.joinToString(", ") {
-                        storage.getContactWithSessionID(it)?.displayName(Contact.ContactContext.REGULAR) ?: it
-                    }
+                    val members = updateData.updatedMembers.joinToString(", ", transform = ::getSenderName)
                    if (isOutgoing) {
                        context.getString(R.string.MessageRecord_you_removed_s_from_the_group, members)
                    } else {
@@ -70,23 +67,19 @@ object UpdateMessageBuilder {
                    }
                }
            }
-            is UpdateMessageData.Kind.GroupMemberLeft -> {
-                message = if (isOutgoing) {
-                    context.getString(R.string.MessageRecord_left_group)
-                } else {
-                    context.getString(R.string.ConversationItem_group_action_left, senderName)
-                }
+            is UpdateMessageData.Kind.GroupMemberLeft -> if (isOutgoing) {
+                context.getString(R.string.MessageRecord_left_group)
+            } else {
+                context.getString(R.string.ConversationItem_group_action_left, senderName)
            }
-            is UpdateMessageData.Kind.OpenGroupInvitation -> { /*Handled externally*/ }
+            else -> return ""
        }
-        return message
    }

    fun buildExpirationTimerMessage(context: Context, duration: Long, senderId: String? = null, isOutgoing: Boolean = false): String {
        if (!isOutgoing && senderId == null) return ""
-        val storage = MessagingModuleConfiguration.shared.storage
-        val senderName: String? = if (!isOutgoing) {
-            storage.getContactWithSessionID(senderId!!)?.displayName(Contact.ContactContext.REGULAR) ?: truncateIdForDisplay(senderId)
+        val senderName: String = if (!isOutgoing) {
+            getSenderName(senderId!!)
        } else { context.getString(R.string.MessageRecord_you) }
        return if (duration <= 0) {
            if (isOutgoing) {
@@ -128,8 +121,7 @@ object UpdateMessageBuilder {
    }

    fun buildDataExtractionMessage(context: Context, kind: DataExtractionNotificationInfoMessage.Kind, senderId: String? = null): String {
-        val storage = MessagingModuleConfiguration.shared.storage
-        val senderName = storage.getContactWithSessionID(senderId!!)?.displayName(Contact.ContactContext.REGULAR) ?: truncateIdForDisplay(senderId)
+        val senderName = getSenderName(senderId!!)
        return when (kind) {
            DataExtractionNotificationInfoMessage.Kind.SCREENSHOT ->
                context.getString(R.string.MessageRecord_s_took_a_screenshot, senderName)
@@ -138,18 +130,12 @@ object UpdateMessageBuilder {
        }
    }

-    fun buildCallMessage(context: Context, type: CallMessageType, sender: String): String {
-        val storage = MessagingModuleConfiguration.shared.storage
-        val senderName = storage.getContactWithSessionID(sender)?.displayName(Contact.ContactContext.REGULAR) ?: sender
-        return when (type) {
-            CallMessageType.CALL_MISSED ->
-                context.getString(R.string.MessageRecord_missed_call_from, senderName)
-            CallMessageType.CALL_INCOMING ->
-                context.getString(R.string.MessageRecord_s_called_you, senderName)
-            CallMessageType.CALL_OUTGOING ->
-                context.getString(R.string.MessageRecord_called_s, senderName)
-            CallMessageType.CALL_FIRST_MISSED ->
-                context.getString(R.string.MessageRecord_missed_call_from, senderName)
+    fun buildCallMessage(context: Context, type: CallMessageType, sender: String): String =
+        when (type) {
+            CALL_INCOMING -> R.string.MessageRecord_s_called_you
+            CALL_OUTGOING -> R.string.MessageRecord_called_s
+            CALL_MISSED, CALL_FIRST_MISSED -> R.string.MessageRecord_missed_call_from
+        }.let {
+            context.getString(it, storage.getContactWithSessionID(sender)?.displayName(Contact.ContactContext.REGULAR) ?: sender)
        }
-    }
 }