[Automated] Update translations from Crowdin

app/build.gradle

@@ -13,8 +13,8 @@ configurations.forEach {
     it.exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 382
-def canonicalVersionName = "1.20.0"
+def canonicalVersionCode = 384
+def canonicalVersionName = "1.20.2"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -56,7 +56,7 @@ android {
 
     splits {
         abi {
-            enable true
+            enable !project.hasProperty('huawei') // huawei builds do not need the split variants
             reset()
             include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
             universalApk true
@@ -68,7 +68,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
+        kotlinCompilerExtensionVersion '1.5.15'
     }
 
     defaultConfig {
@@ -105,6 +105,13 @@ android {
         String sharedTestDir = 'src/sharedTest/java'
         test.java.srcDirs += sharedTestDir
         androidTest.java.srcDirs += sharedTestDir
+        main {
+            assets.srcDirs += "$buildDir/generated/binary"
+        }
+        test {
+            resources.srcDirs += "$buildDir/generated/binary"
+            resources.srcDirs += "$projectDir/src/main/assets"
+        }
     }
 
     buildTypes {
@@ -118,6 +125,25 @@ android {
         }
     }
 
+    signingConfigs {
+        play {
+            if (project.hasProperty('SESSION_STORE_FILE')) {
+                storeFile file(SESSION_STORE_FILE)
+                storePassword SESSION_STORE_PASSWORD
+                keyAlias SESSION_KEY_ALIAS
+                keyPassword SESSION_KEY_PASSWORD
+            }
+        }
+        huawei {
+            if (project.hasProperty('SESSION_HUAWEI_STORE_FILE')) {
+                storeFile file(SESSION_HUAWEI_STORE_FILE)
+                storePassword SESSION_HUAWEI_STORE_PASSWORD
+                keyAlias SESSION_HUAWEI_KEY_ALIAS
+                keyPassword SESSION_HUAWEI_KEY_PASSWORD
+            }
+        }
+    }
+
     flavorDimensions "distribution"
     productFlavors {
         play {
@@ -129,6 +155,7 @@ android {
             buildConfigField "org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.ANDROID"
             buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
             buildConfigField 'String', 'PUSH_KEY_SUFFIX', '\"\"'
+            signingConfig signingConfigs.play
         }
 
         huawei {
@@ -138,6 +165,7 @@ android {
             buildConfigField "org.session.libsession.utilities.Device", "DEVICE", "org.session.libsession.utilities.Device.HUAWEI"
             buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
             buildConfigField 'String', 'PUSH_KEY_SUFFIX', '\"_HUAWEI\"'
+            signingConfig signingConfigs.huawei
         }
 
         website {
@@ -150,13 +178,15 @@ android {
         }
     }
 
-    applicationVariants.forEach { variant ->
+    applicationVariants.configureEach { variant ->
         variant.outputs.each { output ->
             def abiName = output.getFilter("ABI") ?: 'universal'
             def postFix = abiPostFix.get(abiName, 0)
 
+            def flavour = (variant.flavorName == 'huawei') ? "-huawei" : ""
+
             if (postFix >= postFixSize) throw new AssertionError("postFix is too large")
-            output.outputFileName = output.outputFileName = "session-${variant.versionName}-${abiName}.apk"
+            output.outputFileName = output.outputFileName = "session-${variant.versionName}-${abiName}${flavour}.apk"
             output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
         }
     }
@@ -219,6 +249,12 @@ android {
     }
 }
 
+apply {
+    from("ipToCode.gradle.kts")
+}
+
+preBuild.dependsOn ipToCode
+
 dependencies {
     implementation project(':content-descriptions')
 
@@ -245,9 +281,9 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation "androidx.paging:paging-runtime-ktx:$pagingVersion"
-    implementation 'androidx.activity:activity-ktx:1.5.1'
-    implementation 'androidx.activity:activity-compose:1.5.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.3'
+    implementation 'androidx.activity:activity-ktx:1.9.2'
+    implementation 'androidx.activity:activity-compose:1.9.2'
+    implementation 'androidx.fragment:fragment-ktx:1.8.4'
     implementation "androidx.core:core-ktx:$coreVersion"
     implementation "androidx.work:work-runtime-ktx:2.7.1"
 
@@ -353,15 +389,21 @@ dependencies {
     testImplementation 'org.conscrypt:conscrypt-openjdk-uber:2.5.2' // For Robolectric
     testImplementation 'app.cash.turbine:turbine:1.1.0'
 
-    implementation 'com.github.bumptech.glide:compose:1.0.0-alpha.5'
-    implementation "androidx.compose.ui:ui:$composeVersion"
-    implementation "androidx.compose.animation:animation:$composeVersion"
-    implementation "androidx.compose.ui:ui-tooling:$composeVersion"
-    implementation "androidx.compose.runtime:runtime-livedata:$composeVersion"
-    implementation "androidx.compose.foundation:foundation-layout:$composeVersion"
-    implementation "androidx.compose.material3:material3:1.2.1"
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4-android:$composeVersion"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$composeVersion"
+    // compose
+    Dependency composeBom = platform('androidx.compose:compose-bom:2024.09.01')
+    implementation composeBom
+    testImplementation composeBom
+    androidTestImplementation composeBom
+
+    implementation "androidx.compose.ui:ui"
+    implementation "androidx.compose.animation:animation"
+    implementation "androidx.compose.ui:ui-tooling"
+    implementation "androidx.compose.runtime:runtime-livedata"
+    implementation "androidx.compose.foundation:foundation-layout"
+    implementation "androidx.compose.material3:material3"
+
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4-android"
+    debugImplementation "androidx.compose.ui:ui-test-manifest"
 
     implementation "com.google.accompanist:accompanist-themeadapter-appcompat:0.33.1-alpha"
     implementation "com.google.accompanist:accompanist-permissions:0.36.0"

app/ipToCode.gradle.kts

@@ -0,0 +1,41 @@
+import java.io.File
+import java.io.DataOutputStream
+import java.io.FileOutputStream
+
+task("ipToCode") {
+    val inputFile = File("${projectDir}/geolite2_country_blocks_ipv4.csv")
+
+    val outputDir = "${buildDir}/generated/binary"
+    val outputFile = File(outputDir, "geolite2_country_blocks_ipv4.bin").apply { parentFile.mkdirs() }
+
+    outputs.file(outputFile)
+
+    doLast {
+
+        // Ensure the input file exists
+        if (!inputFile.exists()) {
+            throw IllegalArgumentException("Input file does not exist: ${inputFile.absolutePath}")
+        }
+
+        // Create a DataOutputStream to write binary data
+        DataOutputStream(FileOutputStream(outputFile)).use { out ->
+            inputFile.useLines { lines ->
+                var prevCode = -1
+                lines.drop(1).forEach { line ->
+                    runCatching {
+                        val ints = line.split(".", "/", ",")
+                        val code = ints[5].toInt().also { if (it == prevCode) return@forEach }
+                        val ip = ints.take(4).fold(0) { acc, s -> acc shl 8 or s.toInt() }
+
+                        out.writeInt(ip)
+                        out.writeInt(code)
+
+                        prevCode = code
+                    }
+                }
+            }
+        }
+
+        println("Processed data written to: ${outputFile.absolutePath}")
+    }
+}

app/src/huawei/agconnect-services.json

@@ -54,8 +54,8 @@
 			"channel_id":""
 		},
 		"edukit":{
-			"edu_url":"edukit.edu.cloud.huawei.com.cn",
-			"dh_url":"edukit.edu.cloud.huawei.com.cn"
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
 		},
 		"search":{
 			"url":"https://search-dre.cloud.huawei.com"

app/src/huawei/kotlin/org/thoughtcrime/securesms/notifications/HuaweiPushService.kt

@@ -20,8 +20,8 @@ class HuaweiPushService: HmsMessageService() {
 
     override fun onMessageReceived(message: RemoteMessage?) {
         Log.d(TAG, "onMessageReceived")
-        message?.dataOfMap?.takeIf { it.isNotEmpty() }?.let(pushReceiver::onPush) ?:
-        pushReceiver.onPush(message?.data?.let(Base64::decode))
+        message?.dataOfMap?.takeIf { it.isNotEmpty() }?.let(pushReceiver::onPushDataReceived) ?:
+        pushReceiver.onPushDataReceived(message?.data?.let(Base64::decode))
     }
 
     override fun onNewToken(token: String?) {

app/src/huawei/kotlin/org/thoughtcrime/securesms/notifications/HuaweiTokenFetcher.kt

@@ -24,6 +24,8 @@ class HuaweiTokenFetcher @Inject constructor(
     override suspend fun fetch(): String? = HmsInstanceId.getInstance(context).run {
         // https://developer.huawei.com/consumer/en/doc/development/HMS-Guides/push-basic-capability#h2-1576218800370
         // getToken may return an empty string, if so HuaweiPushService#onNewToken will be called.
-        withContext(Dispatchers.IO) { getToken(APP_ID, TOKEN_SCOPE) }
+        withContext(Dispatchers.IO) {
+            getToken(APP_ID, TOKEN_SCOPE)
+        }
     }
 }

app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java

@@ -127,11 +127,7 @@ private void initializeScreenshotSecurity(boolean isResume) {
     if (!isResume) {
       getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
     } else {
-      if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
-      } else {
-        getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
-      }
+      getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -73,6 +73,7 @@
 import org.session.libsession.utilities.recipients.RecipientModifiedListener;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.components.MediaView;
+import org.thoughtcrime.securesms.components.dialogs.DeleteMediaPreviewDialog;
 import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
 import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;

app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt

@@ -62,7 +62,10 @@ class SessionDialogBuilder(val context: Context) {
 
     // Main title entry point
     fun title(text: String?) {
-        text(text, R.style.TextAppearance_Session_Dialog_Title) { setPadding(dp20, 0, dp20, 0) }
+        text(
+            text = text,
+            qaTag = context.getString(R.string.AccessibilityId_modalTitle),
+            style = R.style.TextAppearance_Session_Dialog_Title) { setPadding(dp20, 0, dp20, 0) }
     }
 
     // Convenience assessor for title that takes a string resource
@@ -74,18 +77,24 @@ class SessionDialogBuilder(val context: Context) {
     fun text(@StringRes id: Int, style: Int? = null) = text(context.getString(id), style)
 
     fun text(text: CharSequence?, @StyleRes style: Int? = null) {
-        text(text, style) {
+        text(text = text, style = style) {
             layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
                 .apply { updateMargins(dp40, 0, dp40, 0) }
         }
     }
 
-    private fun text(text: CharSequence?, @StyleRes style: Int? = null, modify: TextView.() -> Unit) {
+    private fun text(
+        text: CharSequence?,
+        qaTag: String = context.getString(R.string.AccessibilityId_modalMessage),
+        @StyleRes style: Int? = null,
+        modify: TextView.() -> Unit
+    ) {
         text ?: return
         TextView(context, null, 0, style ?: R.style.TextAppearance_Session_Dialog_Message)
             .apply {
                 setText(text)
                 textAlignment = View.TEXT_ALIGNMENT_CENTER
+                contentDescription = qaTag
                 modify()
             }.let(topView::addView)
 
@@ -166,7 +175,7 @@ class SessionDialogBuilder(val context: Context) {
             textColor?.let{
                 setTextColor(it)
             }
-            contentDescription = resources.getString(contentDescriptionRes)
+            contentDescription = resources.getString(text) // QA now wants the qa tag to mtch the button's text
             layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, dp60, 1f)
             setOnClickListener {
                 listener.invoke()

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt

@@ -6,6 +6,7 @@ import com.google.protobuf.ByteString
 import org.greenrobot.eventbus.EventBus
 import org.session.libsession.database.MessageDataProvider
 import org.session.libsession.messaging.MessagingModuleConfiguration
+import org.session.libsession.messaging.messages.MarkAsDeletedMessage
 import org.session.libsession.messaging.messages.control.UnsendRequest
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId
@@ -144,6 +145,12 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
         return smsDatabase.isOutgoingMessage(timestamp) || mmsDatabase.isOutgoingMessage(timestamp)
     }
 
+    override fun isDeletedMessage(timestamp: Long): Boolean {
+        val smsDatabase = DatabaseComponent.get(context).smsDatabase()
+        val mmsDatabase = DatabaseComponent.get(context).mmsDatabase()
+        return smsDatabase.isDeletedMessage(timestamp) || mmsDatabase.isDeletedMessage(timestamp)
+    }
+
     override fun handleSuccessfulAttachmentUpload(attachmentId: Long, attachmentStream: SignalServiceAttachmentStream, attachmentKey: ByteArray, uploadResult: UploadResult) {
         val database = DatabaseComponent.get(context).attachmentDatabase()
         val databaseAttachment = getDatabaseAttachment(attachmentId) ?: return
@@ -198,7 +205,6 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
     }
 
     override fun deleteMessages(messageIDs: List<Long>, threadId: Long, isSms: Boolean) {
-
         val messagingDatabase: MessagingDatabase = if (isSms)  DatabaseComponent.get(context).smsDatabase()
                                                    else DatabaseComponent.get(context).mmsDatabase()
 
@@ -215,18 +221,32 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
         threadId?.let{ MessagingModuleConfiguration.shared.lastSentTimestampCache.delete(it, messages.map { it.timestamp }) }
     }
 
-    override fun updateMessageAsDeleted(timestamp: Long, author: String): Long? {
+    override fun markMessageAsDeleted(timestamp: Long, author: String, displayedMessage: String) {
         val database = DatabaseComponent.get(context).mmsSmsDatabase()
         val address = Address.fromSerialized(author)
-        val message = database.getMessageFor(timestamp, address) ?: return null
-        val messagingDatabase: MessagingDatabase = if (message.isMms)  DatabaseComponent.get(context).mmsDatabase()
-                                                   else DatabaseComponent.get(context).smsDatabase()
-        messagingDatabase.markAsDeleted(message.id, message.isRead, message.hasMention)
-        if (message.isOutgoing) {
-            messagingDatabase.deleteMessage(message.id)
-        }
+        val message = database.getMessageFor(timestamp, address) ?: return Log.w("", "Failed to find message to mark as deleted")
+
+        markMessagesAsDeleted(
+            messages = listOf(MarkAsDeletedMessage(
+                messageId = message.id,
+                isOutgoing = message.isOutgoing
+            )),
+            isSms = !message.isMms,
+            displayedMessage = displayedMessage
+        )
+    }
+
+    override fun markMessagesAsDeleted(
+        messages: List<MarkAsDeletedMessage>,
+        isSms: Boolean,
+        displayedMessage: String
+    ) {
+        val messagingDatabase: MessagingDatabase = if (isSms)  DatabaseComponent.get(context).smsDatabase()
+        else DatabaseComponent.get(context).mmsDatabase()
 
-        return message.id
+        messages.forEach { message ->
+            messagingDatabase.markAsDeleted(message.messageId, message.isOutgoing, displayedMessage)
+        }
     }
 
     override fun getServerHashForMessage(messageID: Long, mms: Boolean): String? =