Merge remote-tracking branch 'origin/dev' into release/1.29.2

# Conflicts:
#	app/build.gradle.kts

Author: SessionHero01

.github/workflows/build_and_test.yml

@@ -54,14 +54,14 @@ jobs:
 
       - name: Upload build reports regardless
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: build-reports-${{ matrix.variant }}-${{ matrix.build_type }}
           path: app/build/reports
           if-no-files-found: ignore
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: session-${{ matrix.variant }}-${{ matrix.build_type }}
           path: app/build/outputs/apk/${{ matrix.variant }}/${{ matrix.build_type }}/*-universal*apk

app/build.gradle.kts

@@ -26,8 +26,8 @@ configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 431
-val canonicalVersionName = "1.29.2"
+val canonicalVersionCode = 432
+val canonicalVersionName = "1.30.0"
 
 val postFixSize = 10
 val abiPostFix = mapOf(
@@ -181,13 +181,12 @@ android {
             matchingFallbacks += "release"
 
             signingConfig = signingConfigs.getByName("debug")
-            applicationIdSuffix = ".$name"
 
             devNetDefaultOn(false)
             enablePermissiveNetworkSecurityConfig(true)
 
             setAlternativeAppName("Session QA")
-            setAuthorityPostfix(".qa")
+            setAuthorityPostfix("")
         }
 
         create("automaticQa") {

app/src/main/AndroidManifest.xml

@@ -190,9 +190,6 @@
             android:screenOrientation="portrait" />
         <activity android:name="org.thoughtcrime.securesms.preferences.appearance.AppearanceSettingsActivity"
             android:screenOrientation="portrait"/>
-        <activity android:name="org.thoughtcrime.securesms.conversation.disappearingmessages.DisappearingMessagesActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.Session.DayNight.NoActionBar" />
         <activity android:name="org.thoughtcrime.securesms.groups.GroupMembersActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.NoActionBar" />

app/src/main/java/org/session/libsession/database/StorageProtocol.kt

@@ -1,6 +1,5 @@
 package org.session.libsession.database
 
-import android.content.Context
 import android.net.Uri
 import network.loki.messenger.libsession_util.util.ExpiryMode
 import network.loki.messenger.libsession_util.util.KeyPair
@@ -11,7 +10,6 @@ import org.session.libsession.messaging.jobs.MessageSendJob
 import org.session.libsession.messaging.messages.Message
 import org.session.libsession.messaging.messages.control.GroupUpdated
 import org.session.libsession.messaging.messages.visible.Attachment
-import org.session.libsession.messaging.messages.visible.Profile
 import org.session.libsession.messaging.messages.visible.Reaction
 import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId
@@ -26,7 +24,6 @@ import org.session.libsession.utilities.GroupRecord
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsignal.crypto.ecc.ECKeyPair
 import org.session.libsignal.messages.SignalServiceAttachmentPointer
-import org.session.libsignal.messages.SignalServiceGroup
 import org.session.libsignal.utilities.AccountId
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
@@ -38,12 +35,8 @@ interface StorageProtocol {
     // General
     fun getUserPublicKey(): String?
     fun getUserED25519KeyPair(): KeyPair?
-    fun getUserX25519KeyPair(): ECKeyPair
+    fun getUserX25519KeyPair(): KeyPair
     fun getUserBlindedAccountId(serverPublicKey: String): AccountId?
-    fun getUserProfile(): Profile
-
-    // Signal
-    fun getOrGenerateRegistrationID(): Int
 
     // Jobs
     fun persistJob(job: Job)
@@ -120,8 +113,6 @@ interface StorageProtocol {
     fun addClosedGroupEncryptionKeyPair(encryptionKeyPair: ECKeyPair, groupPublicKey: String, timestamp: Long)
     fun removeAllClosedGroupEncryptionKeyPairs(groupPublicKey: String)
 
-    fun insertOutgoingInfoMessage(context: Context, groupID: String, type: SignalServiceGroup.Type, name: String,
-        members: Collection<String>, admins: Collection<String>, threadID: Long, sentTimestamp: Long): Long?
     fun isLegacyClosedGroup(publicKey: String): Boolean
     fun getClosedGroupEncryptionKeyPairs(groupPublicKey: String): MutableList<ECKeyPair>
     fun getLatestClosedGroupEncryptionKeyPair(groupPublicKey: String): ECKeyPair?

app/src/main/java/org/session/libsession/messaging/file_server/FileServer.kt

@@ -3,11 +3,11 @@ package org.session.libsession.messaging.file_server
 import kotlinx.serialization.Serializable
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.session.libsession.utilities.serializable.HttpSerializer
+import org.session.libsession.utilities.serializable.HttpUrlSerializer
 
 @Serializable
 data class FileServer(
-    @Serializable(with = HttpSerializer::class)
+    @Serializable(with = HttpUrlSerializer::class)
     val url: HttpUrl,
     val ed25519PublicKeyHex: String
 ) {

app/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt

@@ -1,10 +1,8 @@
 package org.session.libsession.messaging.jobs
 
-import android.content.Context
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import dagger.hilt.android.qualifiers.ApplicationContext
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.session.libsession.database.MessageDataProvider
@@ -16,7 +14,6 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.snode.OnionRequestAPI
-import org.session.libsession.snode.utilities.await
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.DecodedAudio
 import org.session.libsession.utilities.InputStreamMediaDataSource
@@ -252,21 +249,18 @@ class AttachmentDownloadJob @AssistedInject constructor(
         return KEY
     }
 
-    class DeserializeFactory(private val factory: Factory) : Job.DeserializeFactory<AttachmentDownloadJob> {
+    @AssistedFactory
+    abstract class Factory : Job.DeserializeFactory<AttachmentDownloadJob> {
+        abstract fun create(
+            @Assisted("attachmentID") attachmentID: Long,
+            mmsMessageId: Long
+        ): AttachmentDownloadJob
 
         override fun create(data: Data): AttachmentDownloadJob {
-            return factory.create(
+            return create(
                 attachmentID = data.getLong(ATTACHMENT_ID_KEY),
                 mmsMessageId = data.getLong(TS_INCOMING_MESSAGE_ID_KEY)
             )
         }
     }
-
-    @AssistedFactory
-    interface Factory {
-        fun create(
-            @Assisted("attachmentID") attachmentID: Long,
-            mmsMessageId: Long
-        ): AttachmentDownloadJob
-    }
 }

app/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt

@@ -15,7 +15,6 @@ import org.session.libsession.messaging.messages.Message
 import org.session.libsession.messaging.open_groups.OpenGroupApi
 import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.utilities.Data
-import org.session.libsession.snode.utilities.await
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.DecodedAudio
 import org.session.libsession.utilities.InputStreamMediaDataSource
@@ -38,6 +37,7 @@ class AttachmentUploadJob @AssistedInject constructor(
     private val attachmentProcessor: AttachmentProcessor,
     private val preferences: TextSecurePreferences,
     private val fileServerApi: FileServerApi,
+    private val messageSender: MessageSender,
 ) : Job {
     override var delegate: JobDelegate? = null
     override var id: String? = null
@@ -219,7 +219,7 @@ class AttachmentUploadJob @AssistedInject constructor(
 
     private fun failAssociatedMessageSendJob(e: Exception) {
         val messageSendJob = storage.getMessageSendJob(messageSendJobID)
-        MessageSender.handleFailedMessageSend(this.message, e)
+        messageSender.handleFailedMessageSend(this.message, e)
         if (messageSendJob != null) {
             storage.markJobAsFailedPermanently(messageSendJobID)
         }
@@ -244,7 +244,14 @@ class AttachmentUploadJob @AssistedInject constructor(
         return KEY
     }
 
-    class DeserializeFactory(private val factory: Factory): Job.DeserializeFactory<AttachmentUploadJob> {
+    @AssistedFactory
+    abstract class Factory : Job.DeserializeFactory<AttachmentUploadJob> {
+        abstract fun create(
+            attachmentID: Long,
+            @Assisted("threadID") threadID: String,
+            message: Message,
+            messageSendJobID: String
+        ): AttachmentUploadJob
 
         override fun create(data: Data): AttachmentUploadJob? {
             val serializedMessage = data.getByteArray(MESSAGE_KEY)
@@ -259,22 +266,12 @@ class AttachmentUploadJob @AssistedInject constructor(
                 return null
             }
             input.close()
-            return factory.create(
+            return create(
                 attachmentID = data.getLong(ATTACHMENT_ID_KEY),
                 threadID = data.getString(THREAD_ID_KEY)!!,
                 message = message,
                 messageSendJobID = data.getString(MESSAGE_SEND_JOB_ID_KEY)!!
             )
         }
     }
-
-    @AssistedFactory
-    interface Factory {
-        fun create(
-            attachmentID: Long,
-            @Assisted("threadID") threadID: String,
-            message: Message,
-            messageSendJobID: String
-        ): AttachmentUploadJob
-    }
 }

app/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt

@@ -51,6 +51,7 @@ data class MessageReceiveParameters(
     val closedGroup: Destination.ClosedGroup? = null
 )
 
+@Deprecated("BatchMessageReceiveJob is now only here so that existing persisted jobs can be processed.")
 class BatchMessageReceiveJob @AssistedInject constructor(
     @Assisted private val messages: List<MessageReceiveParameters>,
     @Assisted val fromCommunity: Address.Community?, // The community the messages are received in, if any
@@ -62,6 +63,7 @@ class BatchMessageReceiveJob @AssistedInject constructor(
     private val messageNotifier: MessageNotifier,
     private val threadDatabase: ThreadDatabase,
     private val recipientRepository: RecipientRepository,
+    private val messageReceiver: MessageReceiver,
 ) : Job {
 
     override var delegate: JobDelegate? = null
@@ -105,6 +107,7 @@ class BatchMessageReceiveJob @AssistedInject constructor(
             fromCommunity = fromCommunity,
             threadDatabase = threadDatabase,
             recipientRepository = recipientRepository,
+            messageReceiver = messageReceiver,
         )
     }
 
@@ -157,7 +160,7 @@ class BatchMessageReceiveJob @AssistedInject constructor(
         messages.forEach { messageParameters ->
             val (data, serverHash, openGroupMessageServerID) = messageParameters
             try {
-                val (message, proto) = MessageReceiver.parse(
+                val (message, proto) = messageReceiver.parse(
                     data,
                     openGroupMessageServerID,
                     openGroupPublicKey = serverPublicKey,
@@ -358,7 +361,8 @@ class BatchMessageReceiveJob @AssistedInject constructor(
 
     @AssistedFactory
     abstract class Factory : Job.DeserializeFactory<BatchMessageReceiveJob> {
-        abstract fun create(
+        @Deprecated("New code should try to handle message directly instead of creating this job")
+        protected abstract fun create(
             messages: List<MessageReceiveParameters>,
             fromCommunity: Address.Community?,
         ): BatchMessageReceiveJob

app/src/main/java/org/session/libsession/messaging/jobs/InviteContactsJob.kt

@@ -2,6 +2,9 @@ package org.session.libsession.messaging.jobs
 
 import android.widget.Toast
 import com.google.protobuf.ByteString
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -16,13 +19,19 @@ import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.messaging.utilities.MessageAuthentication.buildGroupInviteSignature
 import org.session.libsession.snode.SnodeAPI
+import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.getGroup
 import org.session.libsignal.protos.SignalServiceProtos.DataMessage.GroupUpdateInviteMessage
 import org.session.libsignal.protos.SignalServiceProtos.DataMessage.GroupUpdateMessage
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Log
 
-class InviteContactsJob(val groupSessionId: String, val memberSessionIds: Array<String>) : Job {
+class InviteContactsJob @AssistedInject constructor(
+    @Assisted val groupSessionId: String,
+    @Assisted val memberSessionIds: Array<String>,
+    private val configFactory: ConfigFactoryProtocol,
+    private val messageSender: MessageSender,
+) : Job {
 
     companion object {
         const val KEY = "InviteContactJob"
@@ -37,8 +46,7 @@ class InviteContactsJob(val groupSessionId: String, val memberSessionIds: Array<
     override val maxFailureCount: Int = 1
 
     override suspend fun execute(dispatcherName: String) {
-        val configs = MessagingModuleConfiguration.shared.configFactory
-        val group = requireNotNull(configs.getGroup(AccountId(groupSessionId))) {
+        val group = requireNotNull(configFactory.getGroup(AccountId(groupSessionId))) {
             "Group must exist to invite"
         }
 
@@ -54,7 +62,7 @@ class InviteContactsJob(val groupSessionId: String, val memberSessionIds: Array<
                     runCatching {
                         // Make the request for this member
                         val memberId = AccountId(memberSessionId)
-                        val (groupName, subAccount) = configs.withMutableGroupConfigs(sessionId) { configs ->
+                        val (groupName, subAccount) = configFactory.withMutableGroupConfigs(sessionId) { configs ->
                             configs.groupInfo.getName() to configs.groupKeys.makeSubAccount(memberSessionId)
                         }
 
@@ -76,14 +84,14 @@ class InviteContactsJob(val groupSessionId: String, val memberSessionIds: Array<
                             sentTimestamp = timestamp
                         }
 
-                        MessageSender.sendNonDurably(update, Destination.Contact(memberSessionId), false)
+                        messageSender.sendNonDurably(update, Destination.Contact(memberSessionId), false)
                     }
                 }
             }
 
             val results = memberSessionIds.zip(requests.awaitAll())
 
-            configs.withMutableGroupConfigs(sessionId) { configs ->
+            configFactory.withMutableGroupConfigs(sessionId) { configs ->
                 results.forEach { (memberSessionId, result) ->
                     configs.groupMembers.get(memberSessionId)?.let { member ->
                         if (result.isFailure) {
@@ -96,8 +104,8 @@ class InviteContactsJob(val groupSessionId: String, val memberSessionIds: Array<
                 }
             }
 
-            val groupName = configs.withGroupConfigs(sessionId) { it.groupInfo.getName() }
-                ?: configs.getGroup(sessionId)?.name
+            val groupName = configFactory.withGroupConfigs(sessionId) { it.groupInfo.getName() }
+                ?: configFactory.getGroup(sessionId)?.name
 
             // Gather all the exceptions, while keeping track of the invitee account IDs
             val failures = results.mapNotNull { (id, result) ->
@@ -140,4 +148,20 @@ class InviteContactsJob(val groupSessionId: String, val memberSessionIds: Array<
 
     override fun getFactoryKey(): String = KEY
 
+    @AssistedFactory
+    abstract class Factory : Job.DeserializeFactory<InviteContactsJob> {
+        abstract fun create(
+            groupSessionId: String,
+            memberSessionIds: Array<String>,
+        ): InviteContactsJob
+
+        override fun create(data: Data): InviteContactsJob? {
+            val groupSessionId = data.getString(GROUP) ?: return null
+            val memberSessionIds = data.getStringArray(MEMBER) ?: return null
+            return create(
+                groupSessionId = groupSessionId,
+                memberSessionIds = memberSessionIds,
+            )
+        }
+    }
 }