Merge branch 'dev' into feature/update-crowdin-translations

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/MessageFormatter.kt

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.conversation.v2.messages
 import android.content.Context
 import android.text.Spannable
 import android.text.SpannableString
+import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
 import com.squareup.phrase.Phrase
 import network.loki.messenger.R
@@ -177,29 +178,34 @@ class MessageFormatter @Inject constructor(
                 context.getString(R.string.communityInvitation)
             }
 
-            // Show a placeholder text for messages with attachments
-            lastMessage is MmsMessageRecord -> {
-                val placeholderBody = lastMessage.slideDeck.body
-                val messageBody = lastMessage.body
-
-                if (placeholderBody.isNotBlank()) {
-                    if (messageBody.isNotBlank()) {
-                        "$placeholderBody: $messageBody"
-                    } else {
-                        placeholderBody
-                    }
-                } else {
-                    messageBody
-                }
-            }
-
             else -> {
-                val text = formatMessageBody(
+                val bodyText = formatMessageBody(
                     context = context,
                     message = lastMessage,
                     threadRecipient = thread.recipient
                 )
 
+                // This is used to show a placeholder text for MMS messages in the snippet,
+                // for example, "<image> Attachment"
+                val mmsPlaceholderBody = (lastMessage as? MmsMessageRecord)?.slideDeck?.body
+
+                val text = when {
+                    // If both body and placeholder are blank, return empty string
+                    bodyText.isBlank() && mmsPlaceholderBody.isNullOrBlank() -> ""
+
+                    // If both body and placeholder are non-blank, combine them
+                    bodyText.isNotBlank() && !mmsPlaceholderBody.isNullOrBlank() ->
+                        SpannableStringBuilder(mmsPlaceholderBody)
+                            .append(": ")
+                            .append(bodyText)
+
+                    // If only placeholder is non-blank, use it
+                    !mmsPlaceholderBody.isNullOrBlank() -> mmsPlaceholderBody
+
+                    // Otherwise, use the body text
+                    else -> bodyText
+                }
+
                 when {
                     // There are certain messages that we want to keep their formatting
                     lastMessage.groupUpdateMessage?.isGroupLeavingKind() == true ||

app/src/main/java/org/thoughtcrime/securesms/dependencies/ConfigFactory.kt

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.dependencies
 
+import androidx.collection.arrayMapOf
 import androidx.collection.arraySetOf
 import dagger.Lazy
 import kotlinx.coroutines.CoroutineScope
@@ -141,6 +142,7 @@ class ConfigFactory @Inject constructor(
         lock.writeLock().lock()
         return configs to {
             val changed = arraySetOf<UserConfigType>()
+            var dumped: MutableMap<UserConfigType, ByteArray>? = null
 
             for (type in UserConfigType.entries) {
                 val config = configs.getConfig(type)
@@ -149,17 +151,33 @@ class ConfigFactory @Inject constructor(
                 }
 
                 if (config.needsDump()) {
-                    configDatabase.storeConfig(
-                        variant = type.configVariant,
-                        publicKey = requiresCurrentUserAccountId().hexString,
-                        data = config.dump(),
-                        timestamp = clock.currentTimeMills()
-                    )
+                    if (dumped == null) {
+                        dumped = arrayMapOf()
+                    }
+
+                    dumped[type] = config.dump()
                 }
             }
 
             lock.writeLock().unlock()
 
+            // Persist dumped configs
+            if (dumped != null) {
+                coroutineScope.launch {
+                    val userAccountId = requiresCurrentUserAccountId()
+                    val currentTimeMs = clock.currentTimeMills()
+
+                    for ((type, data) in dumped) {
+                        configDatabase.storeConfig(
+                            variant = type.configVariant,
+                            publicKey = userAccountId.hexString,
+                            data = data,
+                            timestamp = currentTimeMs
+                        )
+                    }
+                }
+            }
+
             // Notify changes on a coroutine
             if (changed.isNotEmpty()) {
                 coroutineScope.launch {
@@ -180,19 +198,31 @@ class ConfigFactory @Inject constructor(
                     configs.groupKeys.needsDump() ||
                     configs.groupKeys.needsRekey()
 
-            if (configs.groupInfo.needsDump() || configs.groupMembers.needsDump() ||
+            val dumped = if (configs.groupInfo.needsDump() || configs.groupMembers.needsDump() ||
                 configs.groupKeys.needsDump()) {
-                configDatabase.storeGroupConfigs(
-                    publicKey = groupId.hexString,
-                    keysConfig = configs.groupKeys.dump(),
-                    infoConfig = configs.groupInfo.dump(),
-                    memberConfig = configs.groupMembers.dump(),
-                    timestamp = clock.currentTimeMills()
+                Triple(
+                    configs.groupKeys.dump(),
+                    configs.groupInfo.dump(),
+                    configs.groupMembers.dump()
                 )
+            } else {
+                null
             }
 
             lock.writeLock().unlock()
 
+            if (dumped != null) {
+                coroutineScope.launch {
+                    configDatabase.storeGroupConfigs(
+                        publicKey = groupId.hexString,
+                        keysConfig = dumped.first,
+                        infoConfig = dumped.second,
+                        memberConfig = dumped.third,
+                        timestamp = clock.currentTimeMills()
+                    )
+                }
+            }
+
             // Notify changes on a coroutine
             if (changed) {
                 coroutineScope.launch {

app/src/main/java/org/thoughtcrime/securesms/groups/compose/PromoteMembersScreen.kt

@@ -150,7 +150,7 @@ fun PromoteMembers(
                     .padding(horizontal = LocalDimensions.current.mediumSpacing)
                     .fillMaxWidth()
                     .wrapContentWidth(Alignment.CenterHorizontally),
-                text = LocalResources.current.getString(if (!hasActiveMembers) R.string.noNonAdminsInGroup else R.string.adminCannotBeDemoted),
+                text = LocalResources.current.getString(if (!hasActiveMembers) R.string.noNonAdminsInGroup else R.string.membersGroupPromotionAcceptInvite),
                 textAlign = TextAlign.Center,
                 style = LocalType.current.base,
                 color = LocalColors.current.textSecondary

gradle/libs.versions.toml

@@ -21,18 +21,18 @@ exifinterfaceVersion = "1.4.1"
 firebaseMessagingVersion = "25.0.1"
 flexboxVersion = "3.0.0"
 fragmentKtxVersion = "1.8.9"
-gradlePluginVersion = "8.13.1"
+gradlePluginVersion = "8.13.2"
 dependenciesAnalysisVersion = "3.1.0"
 googleServicesVersion = "4.4.4"
 junit = "1.3.0"
 kotlinVersion = "2.2.21"
 kryoVersion = "5.6.2"
 kspVersion = "2.3.3"
 legacySupportV13Version = "1.0.0"
-libsessionUtilAndroidVersion = "1.0.9-11-g1b8d453"
+libsessionUtilAndroidVersion = "1.1.0"
 media3ExoplayerVersion = "1.8.0"
-mockitoCoreVersion = "5.20.0"
-navVersion = "2.9.5"
+mockitoCoreVersion = "5.21.0"
+navVersion = "2.9.6"
 appcompatVersion = "1.7.1"
 coreVersion = "1.16.0"
 coroutinesVersion = "1.10.2"
@@ -64,7 +64,7 @@ subsamplingScaleImageViewVersion = "3.10.0"
 testCoreVersion = "1.7.0"
 truthVersion = "1.4.5"
 turbineVersion = "1.2.1"
-uiTestJunit4Version = "1.9.4"
+uiTestJunit4Version = "1.10.0"
 workRuntimeKtxVersion = "2.11.0"
 zxingVersion = "3.5.4"
 huaweiPushVersion = "6.13.0.300"