Revert "Release/1.18.5 (#1535)"

This reverts commit 7f90a9866b.

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

@@ -53,7 +53,7 @@ interface StorageProtocol {
     fun persistJob(job: Job)
     fun markJobAsSucceeded(jobId: String)
     fun markJobAsFailedPermanently(jobId: String)
-    fun getAllPendingJobs(vararg types: String): Map<String,Job?>
+    fun getAllPendingJobs(type: String): Map<String,Job?>
     fun getAttachmentUploadJob(attachmentID: Long): AttachmentUploadJob?
     fun getMessageSendJob(messageSendJobID: String): MessageSendJob?
     fun getMessageReceiveJob(messageReceiveJobID: String): Job?

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

@@ -1,8 +1,6 @@
 package org.session.libsession.messaging.jobs
 
 import okhttp3.HttpUrl
-import org.session.libsession.database.MessageDataProvider
-import org.session.libsession.database.StorageProtocol
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.open_groups.OpenGroupApi
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId
@@ -42,36 +40,6 @@ class AttachmentDownloadJob(val attachmentID: Long, val databaseMessageID: Long)
         // Keys used for database storage
         private val ATTACHMENT_ID_KEY = "attachment_id"
         private val TS_INCOMING_MESSAGE_ID_KEY = "tsIncoming_message_id"
-
-        /**
-         * Check if the attachment in the given message is eligible for download.
-         *
-         * Note that this function only checks for the eligibility of the attachment in the sense
-         * of whether the download is allowed, it does not check if the download has already taken
-         * place.
-         */
-        fun eligibleForDownload(threadID: Long,
-                                storage: StorageProtocol,
-                                messageDataProvider: MessageDataProvider,
-                                databaseMessageID: Long): Boolean {
-            val threadRecipient = storage.getRecipientForThread(threadID) ?: return false
-
-            // if we are the sender we are always eligible
-            val selfSend = messageDataProvider.isMmsOutgoing(databaseMessageID)
-            if (selfSend) {
-                return true
-            }
-
-            // you can't be eligible without a sender
-            val sender = messageDataProvider.getIndividualRecipientForMms(databaseMessageID)?.address?.serialize()
-                ?: return false
-
-            // you can't be eligible without a contact entry
-            val contact = storage.getContactWithSessionID(sender) ?: return false
-
-            // we are eligible if we are receiving a group message or the contact is trusted
-            return threadRecipient.isGroupRecipient || contact.isTrusted
-        }
     }
 
     override suspend fun execute(dispatcherName: String) {
@@ -120,7 +88,21 @@ class AttachmentDownloadJob(val attachmentID: Long, val databaseMessageID: Long)
             return
         }
 
-        if (!eligibleForDownload(threadID, storage, messageDataProvider, databaseMessageID)) {
+        val threadRecipient = storage.getRecipientForThread(threadID)
+        val selfSend = messageDataProvider.isMmsOutgoing(databaseMessageID)
+        val sender = if (selfSend) {
+            storage.getUserPublicKey()
+        } else {
+            messageDataProvider.getIndividualRecipientForMms(databaseMessageID)?.address?.serialize()
+        }
+        val contact = sender?.let { storage.getContactWithSessionID(it) }
+        if (threadRecipient == null || sender == null || (contact == null && !selfSend)) {
+            handleFailure(Error.NoSender, null)
+            return
+        }
+        if (!threadRecipient.isGroupRecipient && contact?.isTrusted != true && storage.getUserPublicKey() != sender) {
+            // if we aren't receiving a group message, a message from ourselves (self-send) and the contact sending is not trusted:
+            // do not continue, but do not fail
             handleFailure(Error.NoSender, null)
             return
         }

libsession/src/main/java/org/session/libsession/messaging/jobs/BackgroundGroupAddJob.kt

@@ -37,7 +37,6 @@ class BackgroundGroupAddJob(val joinUrl: String): Job {
                 delegate?.handleJobFailed(this, dispatcherName, DuplicateGroupException())
                 return
             }
-
             storage.addOpenGroup(openGroup.joinUrl())
             storage.onOpenGroupAdded(openGroup.server, openGroup.room)
         } catch (e: Exception) {

libsession/src/main/java/org/session/libsession/messaging/jobs/ConfigurationSyncJob.kt

@@ -1,5 +1,6 @@
 package org.session.libsession.messaging.jobs
 
+import network.loki.messenger.libsession_util.ConfigBase
 import network.loki.messenger.libsession_util.ConfigBase.Companion.protoKindFor
 import nl.komponents.kovenant.functional.bind
 import org.session.libsession.messaging.MessagingModuleConfiguration
@@ -9,6 +10,7 @@ import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.snode.RawResponse
 import org.session.libsession.snode.SnodeAPI
+import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.utilities.Log
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -24,10 +26,14 @@ data class ConfigurationSyncJob(val destination: Destination): Job {
 
     override suspend fun execute(dispatcherName: String) {
         val storage = MessagingModuleConfiguration.shared.storage
+        val forcedConfig = TextSecurePreferences.hasForcedNewConfig(MessagingModuleConfiguration.shared.context)
+        val currentTime = SnodeAPI.nowWithOffset
         val userEdKeyPair = MessagingModuleConfiguration.shared.getUserED25519KeyPair()
         val userPublicKey = storage.getUserPublicKey()
         val delegate = delegate
-        if (destination is Destination.ClosedGroup
+        if (destination is Destination.ClosedGroup // TODO: closed group configs will be handled in closed group feature
+            // if we haven't enabled the new configs don't run
+            || !ConfigBase.isNewConfigEnabled(forcedConfig, currentTime)
             // if we don't have a user ed key pair for signing updates
             || userEdKeyPair == null
             // this will be useful to not handle null delegate cases
@@ -61,7 +67,7 @@ data class ConfigurationSyncJob(val destination: Destination): Job {
             SharedConfigurationMessage(config.protoKindFor(), data, seqNo) to config
         }.map { (message, config) ->
             // return a list of batch request objects
-            val snodeMessage = MessageSender.buildConfigMessageToSnode(destination.destinationPublicKey(), message)
+            val snodeMessage = MessageSender.buildWrappedMessageToSnode(destination, message, true)
             val authenticated = SnodeAPI.buildAuthenticatedStoreBatchInfo(
                 destination.destinationPublicKey(),
                 config.configNamespace(),

libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt

@@ -102,7 +102,7 @@ class JobQueue : JobDelegate {
             execute(dispatcherName)
         }
         catch (e: Exception) {
-            Log.d(dispatcherName, "unhandledJobException: ${javaClass.simpleName} (id: $id)", e)
+            Log.d(dispatcherName, "unhandledJobException: ${javaClass.simpleName} (id: $id)")
             this@JobQueue.handleJobFailed(this, dispatcherName, e)
         }
     }

libsession/src/main/java/org/session/libsession/messaging/open_groups/GroupMember.kt

@@ -6,11 +6,6 @@ data class GroupMember(
     val role: GroupMemberRole
 )
 
-enum class GroupMemberRole(val isModerator: Boolean = false) {
-    STANDARD,
-    ZOOMBIE,
-    MODERATOR(true),
-    ADMIN(true),
-    HIDDEN_MODERATOR(true),
-    HIDDEN_ADMIN(true),
+enum class GroupMemberRole {
+    STANDARD, ZOOMBIE, MODERATOR, ADMIN, HIDDEN_MODERATOR, HIDDEN_ADMIN
 }

libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt

@@ -273,6 +273,7 @@ object OpenGroupApi {
         val queryParameters: Map<String, String> = mapOf(),
         val parameters: Any? = null,
         val headers: Map<String, String> = mapOf(),
+        val isAuthRequired: Boolean = true,
         val body: ByteArray? = null,
         /**
          * Always `true` under normal circumstances. You might want to disable
@@ -318,72 +319,73 @@ object OpenGroupApi {
                 ?: return Promise.ofFail(Error.NoEd25519KeyPair)
             val urlRequest = urlBuilder.toString()
             val headers = request.headers.toMutableMap()
+            if (request.isAuthRequired) {
+                val nonce = sodium.nonce(16)
+                val timestamp = TimeUnit.MILLISECONDS.toSeconds(SnodeAPI.nowWithOffset)
+                var pubKey = ""
+                var signature = ByteArray(Sign.BYTES)
+                var bodyHash = ByteArray(0)
+                if (request.parameters != null) {
+                    val parameterBytes = JsonUtil.toJson(request.parameters).toByteArray()
+                    val parameterHash = ByteArray(GenericHash.BYTES_MAX)
+                    if (sodium.cryptoGenericHash(
+                            parameterHash,
+                            parameterHash.size,
+                            parameterBytes,
+                            parameterBytes.size.toLong()
+                        )
+                    ) {
+                        bodyHash = parameterHash
+                    }
+                } else if (request.body != null) {
+                    val byteHash = ByteArray(GenericHash.BYTES_MAX)
+                    if (sodium.cryptoGenericHash(
+                            byteHash,
+                            byteHash.size,
+                            request.body,
+                            request.body.size.toLong()
+                        )
+                    ) {
+                        bodyHash = byteHash
+                    }
+                }
+                val messageBytes = Hex.fromStringCondensed(publicKey)
+                    .plus(nonce)
+                    .plus("$timestamp".toByteArray(Charsets.US_ASCII))
+                    .plus(request.verb.rawValue.toByteArray())
+                    .plus("/${request.endpoint.value}".toByteArray())
+                    .plus(bodyHash)
+                if (serverCapabilities.isEmpty() || serverCapabilities.contains(Capability.BLIND.name.lowercase())) {
+                    SodiumUtilities.blindedKeyPair(publicKey, ed25519KeyPair)?.let { keyPair ->
+                        pubKey = SessionId(
+                            IdPrefix.BLINDED,
+                            keyPair.publicKey.asBytes
+                        ).hexString
 
-            val nonce = sodium.nonce(16)
-            val timestamp = TimeUnit.MILLISECONDS.toSeconds(SnodeAPI.nowWithOffset)
-            var pubKey = ""
-            var signature = ByteArray(Sign.BYTES)
-            var bodyHash = ByteArray(0)
-            if (request.parameters != null) {
-                val parameterBytes = JsonUtil.toJson(request.parameters).toByteArray()
-                val parameterHash = ByteArray(GenericHash.BYTES_MAX)
-                if (sodium.cryptoGenericHash(
-                        parameterHash,
-                        parameterHash.size,
-                        parameterBytes,
-                        parameterBytes.size.toLong()
-                    )
-                ) {
-                    bodyHash = parameterHash
-                }
-            } else if (request.body != null) {
-                val byteHash = ByteArray(GenericHash.BYTES_MAX)
-                if (sodium.cryptoGenericHash(
-                        byteHash,
-                        byteHash.size,
-                        request.body,
-                        request.body.size.toLong()
-                    )
-                ) {
-                    bodyHash = byteHash
-                }
-            }
-            val messageBytes = Hex.fromStringCondensed(publicKey)
-                .plus(nonce)
-                .plus("$timestamp".toByteArray(Charsets.US_ASCII))
-                .plus(request.verb.rawValue.toByteArray())
-                .plus("/${request.endpoint.value}".toByteArray())
-                .plus(bodyHash)
-            if (serverCapabilities.isEmpty() || serverCapabilities.contains(Capability.BLIND.name.lowercase())) {
-                SodiumUtilities.blindedKeyPair(publicKey, ed25519KeyPair)?.let { keyPair ->
+                        signature = SodiumUtilities.sogsSignature(
+                            messageBytes,
+                            ed25519KeyPair.secretKey.asBytes,
+                            keyPair.secretKey.asBytes,
+                            keyPair.publicKey.asBytes
+                        ) ?: return Promise.ofFail(Error.SigningFailed)
+                    } ?: return Promise.ofFail(Error.SigningFailed)
+                } else {
                     pubKey = SessionId(
-                        IdPrefix.BLINDED,
-                        keyPair.publicKey.asBytes
+                        IdPrefix.UN_BLINDED,
+                        ed25519KeyPair.publicKey.asBytes
                     ).hexString
-
-                    signature = SodiumUtilities.sogsSignature(
+                    sodium.cryptoSignDetached(
+                        signature,
                         messageBytes,
-                        ed25519KeyPair.secretKey.asBytes,
-                        keyPair.secretKey.asBytes,
-                        keyPair.publicKey.asBytes
-                    ) ?: return Promise.ofFail(Error.SigningFailed)
-                } ?: return Promise.ofFail(Error.SigningFailed)
-            } else {
-                pubKey = SessionId(
-                    IdPrefix.UN_BLINDED,
-                    ed25519KeyPair.publicKey.asBytes
-                ).hexString
-                sodium.cryptoSignDetached(
-                    signature,
-                    messageBytes,
-                    messageBytes.size.toLong(),
-                    ed25519KeyPair.secretKey.asBytes
-                )
+                        messageBytes.size.toLong(),
+                        ed25519KeyPair.secretKey.asBytes
+                    )
+                }
+                headers["X-SOGS-Nonce"] = encodeBytes(nonce)
+                headers["X-SOGS-Timestamp"] = "$timestamp"
+                headers["X-SOGS-Pubkey"] = pubKey
+                headers["X-SOGS-Signature"] = encodeBytes(signature)
             }
-            headers["X-SOGS-Nonce"] = encodeBytes(nonce)
-            headers["X-SOGS-Timestamp"] = "$timestamp"
-            headers["X-SOGS-Pubkey"] = pubKey
-            headers["X-SOGS-Signature"] = encodeBytes(signature)
 
             val requestBuilder = okhttp3.Request.Builder()
                 .url(urlRequest)
@@ -925,7 +927,7 @@ object OpenGroupApi {
     }
 
     fun getCapabilities(server: String): Promise<Capabilities, Exception> {
-        val request = Request(verb = GET, room = null, server = server, endpoint = Endpoint.Capabilities)
+        val request = Request(verb = GET, room = null, server = server, endpoint = Endpoint.Capabilities, isAuthRequired = false)
         return getResponseBody(request).map { response ->
             JsonUtil.fromJson(response, Capabilities::class.java)
         }

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt

@@ -81,15 +81,6 @@ object MessageSender {
         }
     }
 
-    fun buildConfigMessageToSnode(destinationPubKey: String, message: SharedConfigurationMessage): SnodeMessage {
-        return SnodeMessage(
-            destinationPubKey,
-            Base64.encodeBytes(message.data),
-            ttl = message.ttl,
-            SnodeAPI.nowWithOffset
-        )
-    }
-
     // One-on-One Chats & Closed Groups
     @Throws(Exception::class)
     fun buildWrappedMessageToSnode(destination: Destination, message: Message, isSyncMessage: Boolean): SnodeMessage {

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt

@@ -203,10 +203,12 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) {
 
     TextSecurePreferences.setConfigurationMessageSynced(context, true)
     TextSecurePreferences.setLastProfileUpdateTime(context, message.sentTimestamp!!)
-
-    TextSecurePreferences.setHasLegacyConfig(context, true)
-    if (!firstTimeSync) return
-
+    val isForceSync = TextSecurePreferences.hasForcedNewConfig(context)
+    val currentTime = SnodeAPI.nowWithOffset
+    if (ConfigBase.isNewConfigEnabled(isForceSync, currentTime)) {
+        TextSecurePreferences.setHasLegacyConfig(context, true)
+        if (!firstTimeSync) return
+    }
     val allClosedGroupPublicKeys = storage.getAllClosedGroupPublicKeys()
     for (closedGroup in message.closedGroups) {
         if (allClosedGroupPublicKeys.contains(closedGroup.publicKey)) {
@@ -258,7 +260,7 @@ fun MessageReceiver.handleUnsendRequest(message: UnsendRequest): Long? {
         SnodeAPI.deleteMessage(author, listOf(serverHash))
     }
     val deletedMessageId = messageDataProvider.updateMessageAsDeleted(timestamp, author)
-    if (!messageDataProvider.isOutgoingMessage(timestamp)) {
+    if (!messageDataProvider.isOutgoingMessage(messageIdToDelete)) {
         SSKEnvironment.shared.notificationManager.updateNotification(context)
     }
 

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt

@@ -25,7 +25,6 @@ import org.session.libsession.snode.RawResponse
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.snode.SnodeModule
 import org.session.libsession.utilities.ConfigFactoryProtocol
-import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.Namespace
 import org.session.libsignal.utilities.Snode
@@ -127,26 +126,37 @@ class Poller(private val configFactory: ConfigFactoryProtocol, debounceTimer: Ti
     private fun processConfig(snode: Snode, rawMessages: RawResponse, namespace: Int, forConfigObject: ConfigBase?) {
         if (forConfigObject == null) return
 
-        val messages = rawMessages["messages"] as? List<*>
-        val processed = if (!messages.isNullOrEmpty()) {
-            SnodeAPI.updateLastMessageHashValueIfPossible(snode, userPublicKey, messages, namespace)
-            SnodeAPI.removeDuplicates(userPublicKey, messages, namespace, true).mapNotNull { messageBody ->
-                val rawMessageAsJSON = messageBody as? Map<*, *> ?: return@mapNotNull null
-                val hashValue = rawMessageAsJSON["hash"] as? String ?: return@mapNotNull null
-                val b64EncodedBody = rawMessageAsJSON["data"] as? String ?: return@mapNotNull null
-                val timestamp = rawMessageAsJSON["t"] as? Long ?: SnodeAPI.nowWithOffset
-                val body = Base64.decode(b64EncodedBody)
-                Triple(body, hashValue, timestamp)
-            }
-        } else emptyList()
+        val messages = SnodeAPI.parseRawMessagesResponse(
+            rawMessages,
+            snode,
+            userPublicKey,
+            namespace,
+            updateLatestHash = true,
+            updateStoredHashes = true,
+        )
 
-        if (processed.isEmpty()) return
+        if (messages.isEmpty()) {
+            // no new messages to process
+            return
+        }
 
         var latestMessageTimestamp: Long? = null
-        processed.forEach { (body, hash, timestamp) ->
+        messages.forEach { (envelope, hash) ->
             try {
-                forConfigObject.merge(hash to body)
-                latestMessageTimestamp = if (timestamp > (latestMessageTimestamp ?: 0L)) { timestamp } else { latestMessageTimestamp }
+                val (message, _) = MessageReceiver.parse(data = envelope.toByteArray(),
+                    // assume no groups in personal poller messages
+                    openGroupServerID = null, currentClosedGroups = emptySet()
+                )
+                // sanity checks
+                if (message !is SharedConfigurationMessage) {
+                    Log.w("Loki", "shared config message handled in configs wasn't SharedConfigurationMessage but was ${message.javaClass.simpleName}")
+                    return@forEach
+                }
+                val merged = forConfigObject.merge(hash!! to message.data).firstOrNull { it == hash }
+                if (merged != null) {
+                    // We successfully merged the hash, we can now update the timestamp
+                    latestMessageTimestamp = if ((message.sentTimestamp ?: 0L) > (latestMessageTimestamp ?: 0L)) { message.sentTimestamp } else { latestMessageTimestamp }
+                }
             } catch (e: Exception) {
                 Log.e("Loki", e)
             }

libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt

@@ -829,7 +829,7 @@ object SnodeAPI {
         }
     }
 
-    fun updateLastMessageHashValueIfPossible(snode: Snode, publicKey: String, rawMessages: List<*>, namespace: Int) {
+    private fun updateLastMessageHashValueIfPossible(snode: Snode, publicKey: String, rawMessages: List<*>, namespace: Int) {
         val lastMessageAsJSON = rawMessages.lastOrNull() as? Map<*, *>
         val hashValue = lastMessageAsJSON?.get("hash") as? String
         if (hashValue != null) {
@@ -839,7 +839,7 @@ object SnodeAPI {
         }
     }
 
-    fun removeDuplicates(publicKey: String, rawMessages: List<*>, namespace: Int, updateStoredHashes: Boolean): List<*> {
+    private fun removeDuplicates(publicKey: String, rawMessages: List<*>, namespace: Int, updateStoredHashes: Boolean): List<*> {
         val originalMessageHashValues = database.getReceivedMessageHashValues(publicKey, namespace)?.toMutableSet() ?: mutableSetOf()
         val receivedMessageHashValues = originalMessageHashValues.toMutableSet()
         val result = rawMessages.filter { rawMessage ->

libsession/src/main/java/org/session/libsession/utilities/IdUtil.kt

@@ -1,4 +1,4 @@
 package org.session.libsession.utilities
 
 fun truncateIdForDisplay(id: String): String =
-    id.takeIf { it.length > 8 }?.run{ "${take(4)}…${takeLast(4)}" } ?: id
+    id.takeIf { it.length > 8 }?.apply{ "${take(4)}…${takeLast(4)}" } ?: id