Merge remote-tracking branch 'upstream/dev' into libsession-integration

# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
2025-12-12 08:13:14 +00:00 · 2023-01-24 16:32:07 +11:00
parent 378601afa5 081d1c4e93
commit d01e27c671
202 changed files with 3479 additions and 4003 deletions
--- a/libsession/build.gradle
+++ b/libsession/build.gradle
@@ -20,17 +20,16 @@ dependencies {
    implementation project(":libsignal")
    implementation project(":libsession-util")
    implementation project(":liblazysodium")
-//    implementation 'com.goterl:lazysodium-android:5.0.2@aar'
    implementation "net.java.dev.jna:jna:5.8.0@aar"
    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation "androidx.core:core-ktx:$coreVersion"
+    implementation "androidx.appcompat:appcompat:$appcompatVersion"
+    implementation "androidx.preference:preference-ktx:$preferenceVersion"
+    implementation "com.google.android.material:material:$materialVersion"
    implementation "com.google.protobuf:protobuf-java:$protobufVersion"
    implementation "com.google.dagger:hilt-android:$daggerVersion"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
    implementation "com.github.bumptech.glide:glide:$glideVersion"
    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
    implementation 'com.annimon:stream:1.1.8'
@@ -44,7 +43,7 @@ dependencies {
    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
    implementation "nl.komponents.kovenant:kovenant:$kovenantVersion"
-    testImplementation 'junit:junit:4.12'
+    testImplementation "junit:junit:$junitVersion"
    testImplementation 'org.assertj:assertj-core:3.11.1'
    testImplementation "org.mockito:mockito-inline:4.0.0"
    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
@@ -52,7 +51,7 @@ dependencies {
    testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
-    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation "androidx.test:core:$testCoreVersion"
    testImplementation "androidx.arch.core:core-testing:2.1.0"
    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
    testImplementation "org.conscrypt:conscrypt-openjdk-uber:2.0.0"
--- a/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java
+++ b/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java
@@ -12,7 +12,6 @@ import androidx.annotation.DrawableRes;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.makeramen.roundedimageview.RoundedDrawable;

-
 import org.session.libsession.R;
 import org.session.libsession.utilities.ThemeUtil;

@@ -34,7 +33,7 @@ public class ResourceContactPhoto implements FallbackContactPhoto {
    Drawable        background = TextDrawable.builder().buildRound(" ", inverted ? Color.WHITE : color);
    RoundedDrawable foreground = (RoundedDrawable) RoundedDrawable.fromDrawable(context.getResources().getDrawable(resourceId));

-    foreground.setScaleType(ImageView.ScaleType.CENTER);
+    foreground.setScaleType(ImageView.ScaleType.CENTER_INSIDE);

    if (inverted) {
      foreground.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
--- a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
+++ b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
@@ -20,8 +20,10 @@ interface MessageDataProvider {
     * @return pair of sms or mms table-specific ID and whether it is in SMS table
     */
    fun getMessageID(serverId: Long, threadId: Long): Pair<Long, Boolean>?
+    fun getMessageIDs(serverIDs: List<Long>, threadID: Long): Pair<List<Long>, List<Long>>
    fun deleteMessage(messageID: Long, isSms: Boolean)
-    fun updateMessageAsDeleted(timestamp: Long, author: String)
+    fun deleteMessages(messageIDs: List<Long>, threadId: Long, isSms: Boolean)
+    fun updateMessageAsDeleted(timestamp: Long, author: String): Long?
    fun getServerHashForMessage(messageID: Long): String?
    fun getDatabaseAttachment(attachmentId: Long): DatabaseAttachment?
    fun getAttachmentStream(attachmentId: Long): SessionServiceAttachmentStream?
@@ -36,7 +38,7 @@ interface MessageDataProvider {
    fun isOutgoingMessage(timestamp: Long): Boolean
    fun handleSuccessfulAttachmentUpload(attachmentId: Long, attachmentStream: SignalServiceAttachmentStream, attachmentKey: ByteArray, uploadResult: UploadResult)
    fun handleFailedAttachmentUpload(attachmentId: Long)
-    fun getMessageForQuote(timestamp: Long, author: Address): Pair<Long, Boolean>?
+    fun getMessageForQuote(timestamp: Long, author: Address): Triple<Long, Boolean, String>?
    fun getAttachmentsAndLinkPreviewFor(mmsId: Long): List<Attachment>
    fun getMessageBodyFor(timestamp: Long, author: String): String
    fun getAttachmentIDsFor(messageID: Long): List<Long>
--- a/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
+++ b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
@@ -12,10 +12,12 @@ import org.session.libsession.messaging.messages.Message
 import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.messaging.messages.control.MessageRequestResponse
 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.open_groups.GroupMember
 import org.session.libsession.messaging.open_groups.OpenGroup
+import org.session.libsession.messaging.open_groups.OpenGroupApi
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
@@ -34,9 +36,7 @@ interface StorageProtocol {
    // General
    fun getUserPublicKey(): String?
    fun getUserX25519KeyPair(): ECKeyPair
-    fun getUserDisplayName(): String?
-    fun getUserProfileKey(): ByteArray?
-    fun getUserProfilePictureURL(): String?
+    fun getUserProfile(): Profile
    fun setUserProfilePictureURL(newProfilePicture: String)
    // Signal
    fun getOrGenerateRegistrationID(): Int
@@ -66,7 +66,7 @@ interface StorageProtocol {
    fun getAllOpenGroups(): Map<Long, OpenGroup>
    fun updateOpenGroup(openGroup: OpenGroup)
    fun getOpenGroup(threadId: Long): OpenGroup?
-    fun addOpenGroup(urlAsString: String)
+    fun addOpenGroup(urlAsString: String): OpenGroupApi.RoomInfo?
    fun onOpenGroupAdded(server: String)
    fun hasBackgroundGroupAddJob(groupJoinUrl: String): Boolean
    fun setOpenGroupServerMessageID(messageID: Long, serverID: Long, threadID: Long, isSms: Boolean)
@@ -80,6 +80,7 @@ interface StorageProtocol {
    // Open Group Metadata
    fun updateTitle(groupID: String, newValue: String)
    fun updateProfilePicture(groupID: String, newValue: ByteArray)
+    fun hasDownloadedProfilePicture(groupID: String): Boolean
    fun setUserCount(room: String, server: String, newValue: Int)

    // Last Message Server ID
@@ -108,6 +109,7 @@ interface StorageProtocol {
    fun markAsSent(timestamp: Long, author: String)
    fun markUnidentified(timestamp: Long, author: String)
    fun setErrorMessage(timestamp: Long, author: String, error: Exception)
+    fun clearErrorMessage(messageID: Long)
    fun setMessageServerHash(messageID: Long, serverHash: String)

    // Closed Groups
@@ -172,7 +174,7 @@ interface StorageProtocol {
     */
    fun persist(message: VisibleMessage, quotes: QuoteModel?, linkPreview: List<LinkPreview?>, groupPublicKey: String?, openGroupID: String?, attachments: List<Attachment>, runIncrement: Boolean, runThreadUpdate: Boolean): Long?
    fun markConversationAsRead(threadId: Long, updateLastSeen: Boolean)
-    fun incrementUnread(threadId: Long, amount: Int)
+    fun incrementUnread(threadId: Long, amount: Int, unreadMentionAmount: Int)
    fun updateThread(threadId: Long, unarchive: Boolean)
    fun insertDataExtractionNotificationMessage(senderPublicKey: String, message: DataExtractionNotificationInfoMessage, sentTimestamp: Long)
    fun insertMessageRequestResponse(response: MessageRequestResponse)
--- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerApi.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerApi.kt
@@ -77,7 +77,11 @@ object FileServerApi {
            OnionRequestAPI.sendOnionRequest(requestBuilder.build(), server, serverPublicKey).map {
                it.body ?: throw Error.ParsingFailed
            }.fail { e ->
-                Log.e("Loki", "File server request failed.", e)
+                when (e) {
+                    // No need for the stack trace for HTTP errors
+                    is HTTP.HTTPRequestFailedException -> Log.e("Loki", "File server request failed due to error: ${e.message}")
+                    else -> Log.e("Loki", "File server request failed", e)
+                }
            }
        } else {
            Promise.ofFail(IllegalStateException("It's currently not allowed to send non onion routed requests."))
@@ -96,7 +100,10 @@ object FileServerApi {
        )
        return send(request).map { response ->
            val json = JsonUtil.fromJson(response, Map::class.java)
-            (json["id"] as? String)?.toLong() ?: throw Error.ParsingFailed
+            val hasId = json.containsKey("id")
+            val id = json.getOrDefault("id", null)
+            Log.d("Loki-FS", "File Upload Response hasId: $hasId of type: ${id?.javaClass}")
+            (id as? String)?.toLong() ?: throw Error.ParsingFailed
        }
    }

--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/BackgroundGroupAddJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/BackgroundGroupAddJob.kt
@@ -41,15 +41,10 @@ class BackgroundGroupAddJob(val joinUrl: String): Job {
            }
            // get image
            storage.setOpenGroupPublicKey(openGroup.server, openGroup.serverPublicKey)
-            val (capabilities, info) = OpenGroupApi.getCapabilitiesAndRoomInfo(openGroup.room, openGroup.server, false).get()
-            storage.setServerCapabilities(openGroup.server, capabilities.capabilities)
-            val imageId = info.imageId
-            storage.addOpenGroup(openGroup.joinUrl())
+            val info = storage.addOpenGroup(openGroup.joinUrl())
+            val imageId = info?.imageId
            if (imageId != null) {
-                val bytes = OpenGroupApi.downloadOpenGroupProfilePicture(openGroup.server, openGroup.room, imageId).get()
-                val groupId = GroupUtil.getEncodedOpenGroupID("${openGroup.server}.${openGroup.room}".toByteArray())
-                storage.updateProfilePicture(groupId, bytes)
-                storage.updateTimestampUpdated(groupId, System.currentTimeMillis())
+                JobQueue.shared.add(GroupAvatarDownloadJob(openGroup.room, openGroup.server))
            }
            Log.d(KEY, "onOpenGroupAdded(${openGroup.server})")
            storage.onOpenGroupAdded(openGroup.server)
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
@@ -11,13 +11,11 @@ import org.session.libsession.database.StorageProtocol
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.messages.Message
 import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
+import org.session.libsession.messaging.messages.control.UnsendRequest
 import org.session.libsession.messaging.messages.visible.ParsedMessage
 import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.open_groups.OpenGroupApi
-import org.session.libsession.messaging.sending_receiving.MessageReceiver
-import org.session.libsession.messaging.sending_receiving.handle
-import org.session.libsession.messaging.sending_receiving.handleOpenGroupReactions
-import org.session.libsession.messaging.sending_receiving.handleVisibleMessage
+import org.session.libsession.messaging.sending_receiving.*
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.messaging.utilities.SessionId
 import org.session.libsession.messaging.utilities.SodiumUtilities
@@ -94,12 +92,23 @@ class BatchMessageReceiveJob(
                        threadMap[threadID]!! += parsedParams
                    }
                } catch (e: Exception) {
-                    Log.e(TAG, "Couldn't receive message.", e)
-                    if (e is MessageReceiver.Error && !e.isRetryable) {
-                        Log.e(TAG, "Message failed permanently",e)
-                    } else {
-                        Log.e(TAG, "Message failed",e)
-                        failures += messageParameters
+                    when (e) {
+                        is MessageReceiver.Error.DuplicateMessage, MessageReceiver.Error.SelfSend -> {
+                            Log.i(TAG, "Couldn't receive message, failed with error: ${e.message}")
+                        }
+                        is MessageReceiver.Error -> {
+                            if (!e.isRetryable) {
+                                Log.e(TAG, "Couldn't receive message, failed permanently", e)
+                            }
+                            else {
+                                Log.e(TAG, "Couldn't receive message, failed", e)
+                                failures += messageParameters
+                            }
+                        }
+                        else -> {
+                            Log.e(TAG, "Couldn't receive message, failed", e)
+                            failures += messageParameters
+                        }
                    }
                }
            }
@@ -108,25 +117,42 @@ class BatchMessageReceiveJob(
            runBlocking(Dispatchers.IO) {
                val deferredThreadMap = threadMap.entries.map { (threadId, messages) ->
                    async {
-                        val messageIds = mutableListOf<Pair<Long, Boolean>>()
+                        // The LinkedHashMap should preserve insertion order
+                        val messageIds = linkedMapOf<Long, Pair<Boolean, Boolean>>()
+
                        messages.forEach { (parameters, message, proto) ->
                            try {
-                                if (message is VisibleMessage) {
-                                    val messageId = MessageReceiver.handleVisibleMessage(message, proto, openGroupID,
-                                        runIncrement = false,
-                                        runThreadUpdate = false,
-                                        runProfileUpdate = true
-                                    )
-                                    if (messageId != null && message.reaction == null) {
-                                        val isUserBlindedSender = message.sender == serverPublicKey?.let { SodiumUtilities.blindedKeyPair(it, MessagingModuleConfiguration.shared.getUserED25519KeyPair()!!) }?.let { SessionId(
-                                            IdPrefix.BLINDED, it.publicKey.asBytes).hexString }
-                                        messageIds += messageId to (message.sender == localUserPublicKey || isUserBlindedSender)
+                                when (message) {
+                                    is VisibleMessage -> {
+                                        val messageId = MessageReceiver.handleVisibleMessage(message, proto, openGroupID,
+                                                runIncrement = false,
+                                                runThreadUpdate = false,
+                                                runProfileUpdate = true
+                                        )
+
+                                        if (messageId != null && message.reaction == null) {
+                                            val isUserBlindedSender = message.sender == serverPublicKey?.let { SodiumUtilities.blindedKeyPair(it, MessagingModuleConfiguration.shared.getUserED25519KeyPair()!!) }?.let { SessionId(
+                                                    IdPrefix.BLINDED, it.publicKey.asBytes).hexString }
+                                            messageIds[messageId] = Pair(
+                                                (message.sender == localUserPublicKey || isUserBlindedSender),
+                                                message.hasMention
+                                            )
+                                        }
+                                        parameters.openGroupMessageServerID?.let {
+                                            MessageReceiver.handleOpenGroupReactions(threadId, it, parameters.reactions)
+                                        }
                                    }
-                                    parameters.openGroupMessageServerID?.let {
-                                        MessageReceiver.handleOpenGroupReactions(threadId, it, parameters.reactions)
+
+                                    is UnsendRequest -> {
+                                        val deletedMessageId = MessageReceiver.handleUnsendRequest(message)
+
+                                        // If we removed a message then ensure it isn't in the 'messageIds'
+                                        if (deletedMessageId != null) {
+                                            messageIds.remove(deletedMessageId)
+                                        }
                                    }
-                                } else {
-                                    MessageReceiver.handle(message, proto, openGroupID)
+
+                                    else -> MessageReceiver.handle(message, proto, openGroupID)
                                }
                            } catch (e: Exception) {
                                Log.e(TAG, "Couldn't process message.", e)
@@ -139,14 +165,20 @@ class BatchMessageReceiveJob(
                            }
                        }
                        // increment unreads, notify, and update thread
-                        val unreadFromMine = messageIds.indexOfLast { (_,fromMe) -> fromMe }
-                        var trueUnreadCount = messageIds.filter { (_,fromMe) -> !fromMe }.size
+                        val unreadFromMine = messageIds.map { it.value.first }.indexOfLast { it }
+                        var trueUnreadCount = messageIds.filter { !it.value.first }.size
+                        var trueUnreadMentionCount = messageIds.filter { !it.value.first && it.value.second }.size
                        if (unreadFromMine >= 0) {
-                            trueUnreadCount -= (unreadFromMine + 1)
                            storage.markConversationAsRead(threadId, false)
+
+                            val trueUnreadIds = messageIds.keys.toList().subList(unreadFromMine + 1, messageIds.keys.count())
+                            trueUnreadCount = trueUnreadIds.size
+                            trueUnreadMentionCount = messageIds
+                                    .filter { trueUnreadIds.contains(it.key) && !it.value.first && it.value.second }
+                                    .size
                        }
                        if (trueUnreadCount > 0) {
-                            storage.incrementUnread(threadId, trueUnreadCount)
+                            storage.incrementUnread(threadId, trueUnreadCount, trueUnreadMentionCount)
                        }
                        storage.updateThread(threadId, true)
                        SSKEnvironment.shared.notificationManager.updateNotification(context, threadId)
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/GroupAvatarDownloadJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/GroupAvatarDownloadJob.kt
@@ -14,10 +14,9 @@ class GroupAvatarDownloadJob(val room: String, val server: String) : Job {

    override fun execute() {
        val storage = MessagingModuleConfiguration.shared.storage
+        val imageId = storage.getOpenGroup(room, server)?.imageId ?: return
        try {
-            val info = OpenGroupApi.getRoomInfo(room, server).get()
-            val imageId = info.imageId ?: return
-            val bytes = OpenGroupApi.downloadOpenGroupProfilePicture(server, info.token, imageId).get()
+            val bytes = OpenGroupApi.downloadOpenGroupProfilePicture(server, room, imageId).get()
            val groupId = GroupUtil.getEncodedOpenGroupID("$server.$room".toByteArray())
            storage.updateProfilePicture(groupId, bytes)
            storage.updateTimestampUpdated(groupId, System.currentTimeMillis())
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt
@@ -26,7 +26,7 @@ class JobQueue : JobDelegate {
    private val jobTimestampMap = ConcurrentHashMap<Long, AtomicInteger>()
    private val rxDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
    private val rxMediaDispatcher = Executors.newFixedThreadPool(4).asCoroutineDispatcher()
-    private val openGroupDispatcher = Executors.newCachedThreadPool().asCoroutineDispatcher()
+    private val openGroupDispatcher = Executors.newFixedThreadPool(8).asCoroutineDispatcher()
    private val txDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
    private val scope = CoroutineScope(Dispatchers.Default) + SupervisorJob()
    private val queue = Channel<Job>(UNLIMITED)
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
@@ -11,6 +11,7 @@ import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.snode.OnionRequestAPI
+import org.session.libsignal.utilities.HTTP
 import org.session.libsignal.utilities.Log

 class MessageSendJob(val message: Message, val destination: Destination) : Job {
@@ -67,14 +68,25 @@ class MessageSendJob(val message: Message, val destination: Destination) : Job {
        val promise = MessageSender.send(this.message, this.destination).success {
            this.handleSuccess()
        }.fail { exception ->
-            Log.e(TAG, "Couldn't send message due to error: $exception.")
-            if (exception is MessageSender.Error) {
-                if (!exception.isRetryable) { this.handlePermanentFailure(exception) }
+            var logStacktrace = true
+
+            when (exception) {
+                // No need for the stack trace for HTTP errors
+                is HTTP.HTTPRequestFailedException -> {
+                    logStacktrace = false
+
+                    if (exception.statusCode == 429) { this.handlePermanentFailure(exception) }
+                    else { this.handleFailure(exception) }
+                }
+                is MessageSender.Error -> {
+                    if (!exception.isRetryable) { this.handlePermanentFailure(exception) }
+                    else { this.handleFailure(exception) }
+                }
+                else -> this.handleFailure(exception)
            }
-            if (exception is OnionRequestAPI.HTTPRequestFailedAtDestinationException && exception.statusCode == 429) {
-                this.handlePermanentFailure(exception)
-            }
-            this.handleFailure(exception)
+
+            if (logStacktrace) { Log.e(TAG, "Couldn't send message due to error", exception) }
+            else { Log.e(TAG, "Couldn't send message due to error: ${exception.message}") }
        }
        try {
            promise.get()
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/OpenGroupDeleteJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/OpenGroupDeleteJob.kt
@@ -23,14 +23,27 @@ class OpenGroupDeleteJob(private val messageServerIds: LongArray, private val th
        val dataProvider = MessagingModuleConfiguration.shared.messageDataProvider
        val numberToDelete = messageServerIds.size
        Log.d(TAG, "Deleting $numberToDelete messages")
-        var numberDeleted = 0
-        messageServerIds.forEach { serverId ->
-            val (messageId, isSms) = dataProvider.getMessageID(serverId, threadId) ?: return@forEach
-            dataProvider.deleteMessage(messageId, isSms)
-            numberDeleted++
+
+        // FIXME: This entire process should probably run in a transaction (with the attachment deletion happening only if it succeeded)
+        try {
+            val messageIds = dataProvider.getMessageIDs(messageServerIds.toList(), threadId)
+
+            // Delete the SMS messages
+            if (messageIds.first.isNotEmpty()) {
+                dataProvider.deleteMessages(messageIds.first, threadId, true)
+            }
+
+            // Delete the MMS messages
+            if (messageIds.second.isNotEmpty()) {
+                dataProvider.deleteMessages(messageIds.second, threadId, false)
+            }
+
+            Log.d(TAG, "Deleted ${messageIds.first.size + messageIds.second.size} messages successfully")
+            delegate?.handleJobSucceeded(this)
+        }
+        catch (e: Exception) {
+            delegate?.handleJobFailed(this, e)
        }
-        Log.d(TAG, "Deleted $numberDeleted messages successfully")
-        delegate?.handleJobSucceeded(this)
    }

    override fun serialize(): Data = Data.Builder()
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt
@@ -1,15 +1,22 @@
 package org.session.libsession.messaging.messages.control

+import com.google.protobuf.ByteString
+import org.session.libsession.messaging.messages.visible.Profile
 import org.session.libsignal.protos.SignalServiceProtos
 import org.session.libsignal.utilities.Log

-class MessageRequestResponse(val isApproved: Boolean) : ControlMessage() {
+class MessageRequestResponse(val isApproved: Boolean, var profile: Profile? = null) : ControlMessage() {

    override val isSelfSendValid: Boolean = true

    override fun toProto(): SignalServiceProtos.Content? {
+        val profileProto = SignalServiceProtos.DataMessage.LokiProfile.newBuilder()
+        profile?.displayName?.let { profileProto.displayName = it }
+        profile?.profilePictureURL?.let { profileProto.profilePicture = it }
        val messageRequestResponseProto = SignalServiceProtos.MessageRequestResponse.newBuilder()
            .setIsApproved(isApproved)
+            .setProfile(profileProto.build())
+        profile?.profileKey?.let { messageRequestResponseProto.profileKey = ByteString.copyFrom(it) }
        return try {
            SignalServiceProtos.Content.newBuilder()
                .setMessageRequestResponse(messageRequestResponseProto.build())
@@ -26,7 +33,13 @@ class MessageRequestResponse(val isApproved: Boolean) : ControlMessage() {
        fun fromProto(proto: SignalServiceProtos.Content): MessageRequestResponse? {
            val messageRequestResponseProto = if (proto.hasMessageRequestResponse()) proto.messageRequestResponse else return null
            val isApproved = messageRequestResponseProto.isApproved
-            return MessageRequestResponse(isApproved)
+            val profileProto = messageRequestResponseProto.profile
+            val profile = Profile().apply {
+                displayName = profileProto.displayName
+                profileKey = if (messageRequestResponseProto.hasProfileKey()) messageRequestResponseProto.profileKey.toByteArray() else null
+                profilePictureURL = profileProto.profilePicture
+            }
+            return MessageRequestResponse(isApproved, profile)
        }
    }

--- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java
@@ -29,6 +29,7 @@ public class IncomingMediaMessage {
  private final boolean       expirationUpdate;
  private final boolean       unidentified;
  private final boolean       messageRequestResponse;
+  private final boolean       hasMention;

  private final DataExtractionNotificationInfoMessage dataExtractionNotification;
  private final QuoteModel                            quote;
@@ -44,6 +45,7 @@ public class IncomingMediaMessage {
                              boolean expirationUpdate,
                              boolean unidentified,
                              boolean messageRequestResponse,
+                              boolean hasMention,
                              Optional<String> body,
                              Optional<SignalServiceGroup> group,
                              Optional<List<SignalServiceAttachment>> attachments,
@@ -63,6 +65,7 @@ public class IncomingMediaMessage {
    this.quote                      = quote.orNull();
    this.unidentified               = unidentified;
    this.messageRequestResponse     = messageRequestResponse;
+    this.hasMention                 = hasMention;

    if (group.isPresent()) this.groupId = Address.fromSerialized(GroupUtil.INSTANCE.getEncodedId(group.get()));
    else                   this.groupId = null;
@@ -81,7 +84,8 @@ public class IncomingMediaMessage {
                                          Optional<List<LinkPreview>> linkPreviews)
  {
    return new IncomingMediaMessage(from, message.getSentTimestamp(), -1, expiresIn, false,
-            false, false, Optional.fromNullable(message.getText()), group, Optional.fromNullable(attachments), quote, Optional.absent(), linkPreviews, Optional.absent());
+            false, false, message.getHasMention(), Optional.fromNullable(message.getText()),
+            group, Optional.fromNullable(attachments), quote, Optional.absent(), linkPreviews, Optional.absent());
  }

  public int getSubscriptionId() {
@@ -124,6 +128,10 @@ public class IncomingMediaMessage {
    return groupId != null;
  }

+  public boolean hasMention() {
+    return hasMention;
+  }
+
  public boolean isScreenshotDataExtraction() {
    if (dataExtractionNotification == null) return false;
    else {
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java
@@ -43,24 +43,25 @@ public class IncomingTextMessage implements Parcelable {
  private final long    expiresInMillis;
  private final boolean unidentified;
  private final int     callType;
+  private final boolean hasMention;

  private boolean isOpenGroupInvitation = false;

  public IncomingTextMessage(Address sender, int senderDeviceId, long sentTimestampMillis,
                           String encodedBody, Optional<SignalServiceGroup> group,
-                           long expiresInMillis, boolean unidentified) {
-    this(sender, senderDeviceId, sentTimestampMillis, encodedBody, group, expiresInMillis, unidentified, -1);
+                           long expiresInMillis, boolean unidentified, boolean hasMention) {
+    this(sender, senderDeviceId, sentTimestampMillis, encodedBody, group, expiresInMillis, unidentified, -1, hasMention);
  }

  public IncomingTextMessage(Address sender, int senderDeviceId, long sentTimestampMillis,
                             String encodedBody, Optional<SignalServiceGroup> group,
-                             long expiresInMillis, boolean unidentified, int callType) {
-    this(sender, senderDeviceId, sentTimestampMillis, encodedBody, group, expiresInMillis, unidentified, callType, true);
+                             long expiresInMillis, boolean unidentified, int callType, boolean hasMention) {
+    this(sender, senderDeviceId, sentTimestampMillis, encodedBody, group, expiresInMillis, unidentified, callType, hasMention, true);
  }

  public IncomingTextMessage(Address sender, int senderDeviceId, long sentTimestampMillis,
                             String encodedBody, Optional<SignalServiceGroup> group,
-                             long expiresInMillis, boolean unidentified, int callType, boolean isPush) {
+                             long expiresInMillis, boolean unidentified, int callType, boolean hasMention, boolean isPush) {
    this.message              = encodedBody;
    this.sender               = sender;
    this.senderDeviceId       = senderDeviceId;
@@ -74,6 +75,7 @@ public class IncomingTextMessage implements Parcelable {
    this.expiresInMillis      = expiresInMillis;
    this.unidentified         = unidentified;
    this.callType             = callType;
+    this.hasMention           = hasMention;

    if (group.isPresent()) {
      this.groupId = Address.fromSerialized(GroupUtil.getEncodedId(group.get()));
@@ -98,6 +100,7 @@ public class IncomingTextMessage implements Parcelable {
    this.unidentified          = in.readInt() == 1;
    this.isOpenGroupInvitation = in.readInt() == 1;
    this.callType              = in.readInt();
+    this.hasMention            = in.readInt() == 1;
  }

  public IncomingTextMessage(IncomingTextMessage base, String newBody) {
@@ -116,6 +119,7 @@ public class IncomingTextMessage implements Parcelable {
    this.unidentified          = base.isUnidentified();
    this.isOpenGroupInvitation = base.isOpenGroupInvitation();
    this.callType              = base.callType;
+    this.hasMention            = base.hasMention;
  }

  public static IncomingTextMessage from(VisibleMessage message,
@@ -123,7 +127,7 @@ public class IncomingTextMessage implements Parcelable {
                                         Optional<SignalServiceGroup> group,
                                         long expiresInMillis)
  {
-    return new IncomingTextMessage(sender, 1, message.getSentTimestamp(), message.getText(), group, expiresInMillis, false);
+    return new IncomingTextMessage(sender, 1, message.getSentTimestamp(), message.getText(), group, expiresInMillis, false, message.getHasMention());
  }

  public static IncomingTextMessage fromOpenGroupInvitation(OpenGroupInvitation openGroupInvitation, Address sender, Long sentTimestamp)
@@ -133,7 +137,7 @@ public class IncomingTextMessage implements Parcelable {
    if (url == null || name == null) { return null; }
    // FIXME: Doing toJSON() to get the body here is weird
    String body = UpdateMessageData.Companion.buildOpenGroupInvitation(url, name).toJSON();
-    IncomingTextMessage incomingTextMessage = new IncomingTextMessage(sender, 1, sentTimestamp, body, Optional.absent(), 0, false);
+    IncomingTextMessage incomingTextMessage = new IncomingTextMessage(sender, 1, sentTimestamp, body, Optional.absent(), 0, false, false);
    incomingTextMessage.isOpenGroupInvitation = true;
    return incomingTextMessage;
  }
@@ -142,7 +146,7 @@ public class IncomingTextMessage implements Parcelable {
                                                 Address sender,
                                                 Optional<SignalServiceGroup> group,
                                                 long sentTimestamp) {
-    return new IncomingTextMessage(sender, 1, sentTimestamp, null, group, 0, false, callMessageType.ordinal(), false);
+    return new IncomingTextMessage(sender, 1, sentTimestamp, null, group, 0, false, callMessageType.ordinal(), false, false);
  }

  public int getSubscriptionId() {
@@ -207,6 +211,8 @@ public class IncomingTextMessage implements Parcelable {

  public boolean isOpenGroupInvitation() { return isOpenGroupInvitation; }

+  public boolean hasMention() { return hasMention; }
+
  public boolean isCallInfo() {
    int callMessageTypeLength = CallMessageType.values().length;
    return callType >= 0 && callType < callMessageTypeLength;
@@ -240,5 +246,6 @@ public class IncomingTextMessage implements Parcelable {
    out.writeInt(unidentified ? 1 : 0);
    out.writeInt(isOpenGroupInvitation ? 1 : 0);
    out.writeInt(callType);
+    out.writeInt(hasMention ? 1 : 0);
  }
 }
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java
@@ -85,8 +85,8 @@ public class OutgoingMediaMessage {
      previews = Collections.singletonList(linkPreview);
    }
    return new OutgoingMediaMessage(recipient, message.getText(), attachments, message.getSentTimestamp(), -1,
-            recipient.getExpireMessages() * 1000, DistributionTypes.DEFAULT, outgoingQuote, Collections.emptyList(),
-            previews, Collections.emptyList(), Collections.emptyList());
+            recipient.getExpireMessages() * 1000, DistributionTypes.DEFAULT, outgoingQuote,
+            Collections.emptyList(), previews, Collections.emptyList(), Collections.emptyList());
  }

  public Recipient getRecipient() {
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt
@@ -25,7 +25,7 @@ class Profile() {
        }
    }

-    internal constructor(displayName: String, profileKey: ByteArray? = null, profilePictureURL: String? = null) : this() {
+    constructor(displayName: String, profileKey: ByteArray? = null, profilePictureURL: String? = null) : this() {
        this.displayName = displayName
        this.profileKey = profileKey
        this.profilePictureURL = profilePictureURL
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
@@ -24,6 +24,7 @@ class VisibleMessage : Message()  {
    var profile: Profile? = null
    var openGroupInvitation: OpenGroupInvitation? = null
    var reaction: Reaction? = null
+    var hasMention: Boolean = false

    override val isSelfSendValid: Boolean = true

--- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroup.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroup.kt
@@ -11,16 +11,19 @@ data class OpenGroup(
    val id: String,
    val name: String,
    val publicKey: String,
+    val imageId: String?,
    val infoUpdates: Int,
+    val canWrite: Boolean,
 ) {
-
-    constructor(server: String, room: String, name: String, infoUpdates: Int, publicKey: String) : this(
+    constructor(server: String, room: String, publicKey: String, name: String, imageId: String?, canWrite: Boolean, infoUpdates: Int) : this(
        server = server,
        room = room,
        id = "$server.$room",
        name = name,
        publicKey = publicKey,
+        imageId = imageId,
        infoUpdates = infoUpdates,
+        canWrite = canWrite
    )

    companion object {
@@ -29,13 +32,14 @@ data class OpenGroup(
            return try {
                val json = JsonUtil.fromJson(jsonAsString)
                if (!json.has("room")) return null
-                val room = json.get("room").asText().toLowerCase(Locale.US)
-                val server = json.get("server").asText().toLowerCase(Locale.US)
+                val room = json.get("room").asText().lowercase(Locale.US)
+                val server = json.get("server").asText().lowercase(Locale.US)
                val displayName = json.get("displayName").asText()
                val publicKey = json.get("publicKey").asText()
+                val imageId = json.get("imageId")?.asText()
+                val canWrite = json.get("canWrite")?.asText()?.toBoolean() ?: true
                val infoUpdates = json.get("infoUpdates")?.asText()?.toIntOrNull() ?: 0
-                val capabilities = json.get("capabilities")?.asText()?.split(",") ?: emptyList()
-                OpenGroup(server, room, displayName, infoUpdates, publicKey)
+                OpenGroup(server = server, room = room, name = displayName, publicKey = publicKey, imageId = imageId, canWrite = canWrite, infoUpdates = infoUpdates)
            } catch (e: Exception) {
                Log.w("Loki", "Couldn't parse open group from JSON: $jsonAsString.", e);
                null
@@ -53,12 +57,14 @@ data class OpenGroup(
        }
    }

-    fun toJson(): Map<String,String> = mapOf(
+    fun toJson(): Map<String,String?> = mapOf(
        "room" to room,
        "server" to server,
-        "displayName" to name,
        "publicKey" to publicKey,
+        "displayName" to name,
+        "imageId" to imageId,
        "infoUpdates" to infoUpdates.toString(),
+        "canWrite" to canWrite.toString()
    )

    val joinURL: String get() = "$server/$room?public_key=$publicKey"
--- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt
@@ -91,7 +91,7 @@ object OpenGroupApi {
        val created: Long = 0,
        val activeUsers: Int = 0,
        val activeUsersCutoff: Int = 0,
-        val imageId: Long? = null,
+        val imageId: String? = null,
        val pinnedMessages: List<PinnedMessage> = emptyList(),
        val admin: Boolean = false,
        val globalAdmin: Boolean = false,
@@ -148,7 +148,7 @@ object OpenGroupApi {
    )

    enum class Capability {
-        BLIND, REACTIONS
+        SOGS, BLIND, REACTIONS
    }

    @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy::class)
@@ -337,7 +337,7 @@ object OpenGroupApi {
                    .plus(request.verb.rawValue.toByteArray())
                    .plus("/${request.endpoint.value}".toByteArray())
                    .plus(bodyHash)
-                if (serverCapabilities.contains(Capability.BLIND.name.lowercase())) {
+                if (serverCapabilities.isEmpty() || serverCapabilities.contains(Capability.BLIND.name.lowercase())) {
                    SodiumUtilities.blindedKeyPair(publicKey, ed25519KeyPair)?.let { keyPair ->
                        pubKey = SessionId(
                            IdPrefix.BLINDED,
@@ -383,7 +383,11 @@ object OpenGroupApi {
            }
            return if (request.useOnionRouting) {
                OnionRequestAPI.sendOnionRequest(requestBuilder.build(), request.server, publicKey).fail { e ->
-                    Log.e("SOGS", "Failed onion request", e)
+                    when (e) {
+                        // No need for the stack trace for HTTP errors
+                        is HTTP.HTTPRequestFailedException -> Log.e("SOGS", "Failed onion request: ${e.message}")
+                        else -> Log.e("SOGS", "Failed onion request", e)
+                    }
                }
            } else {
                Promise.ofFail(IllegalStateException("It's currently not allowed to send non onion routed requests."))
@@ -395,13 +399,13 @@ object OpenGroupApi {
    fun downloadOpenGroupProfilePicture(
        server: String,
        roomID: String,
-        imageId: Long
+        imageId: String
    ): Promise<ByteArray, Exception> {
        val request = Request(
            verb = GET,
            room = roomID,
            server = server,
-            endpoint = Endpoint.RoomFileIndividual(roomID, imageId.toString())
+            endpoint = Endpoint.RoomFileIndividual(roomID, imageId)
        )
        return getResponseBody(request)
    }
@@ -794,16 +798,14 @@ object OpenGroupApi {

    private fun sequentialBatch(
        server: String,
-        requests: MutableList<BatchRequestInfo<*>>,
-        authRequired: Boolean = true
+        requests: MutableList<BatchRequestInfo<*>>
    ): Promise<List<BatchResponse<*>>, Exception> {
        val request = Request(
            verb = POST,
            room = null,
            server = server,
            endpoint = Endpoint.Sequence,
-            parameters = requests.map { it.request },
-            isAuthRequired = authRequired
+            parameters = requests.map { it.request }
        )
        return getBatchResponseJson(request, requests)
    }
@@ -912,8 +914,7 @@ object OpenGroupApi {

    fun getCapabilitiesAndRoomInfo(
        room: String,
-        server: String,
-        authRequired: Boolean = true
+        server: String
    ): Promise<Pair<Capabilities, RoomInfo>, Exception> {
        val requests = mutableListOf<BatchRequestInfo<*>>(
            BatchRequestInfo(
@@ -933,7 +934,7 @@ object OpenGroupApi {
                responseType = object : TypeReference<RoomInfo>(){}
            )
        )
-        return sequentialBatch(server, requests, authRequired).map {
+        return sequentialBatch(server, requests).map {
            val capabilities = it.firstOrNull()?.body as? Capabilities ?: throw Error.ParsingFailed
            val roomInfo = it.lastOrNull()?.body as? RoomInfo ?: throw Error.ParsingFailed
            capabilities to roomInfo
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
@@ -12,9 +12,9 @@ import org.session.libsession.messaging.messages.control.CallMessage
 import org.session.libsession.messaging.messages.control.ClosedGroupControlMessage
 import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
+import org.session.libsession.messaging.messages.control.MessageRequestResponse
 import org.session.libsession.messaging.messages.control.UnsendRequest
 import org.session.libsession.messaging.messages.visible.LinkPreview
-import org.session.libsession.messaging.messages.visible.Profile
 import org.session.libsession.messaging.messages.visible.Quote
 import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.open_groups.OpenGroupApi
@@ -32,12 +32,7 @@ import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.SSKEnvironment
 import org.session.libsignal.crypto.PushTransportDetails
 import org.session.libsignal.protos.SignalServiceProtos
-import org.session.libsignal.utilities.Base64
-import org.session.libsignal.utilities.IdPrefix
-import org.session.libsignal.utilities.Namespace
-import org.session.libsignal.utilities.defaultRequiresAuth
-import org.session.libsignal.utilities.hasNamespaces
-import org.session.libsignal.utilities.hexEncodedPublicKey
+import org.session.libsignal.utilities.*
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment
@@ -118,14 +113,10 @@ object MessageSender {
            }
            // Attach the user's profile if needed
            if (message is VisibleMessage) {
-                val displayName = storage.getUserDisplayName()!!
-                val profileKey = storage.getUserProfileKey()
-                val profilePictureUrl = storage.getUserProfilePictureURL()
-                if (profileKey != null && profilePictureUrl != null) {
-                    message.profile = Profile(displayName, profileKey, profilePictureUrl)
-                } else {
-                    message.profile = Profile(displayName)
-                }
+                message.profile = storage.getUserProfile()
+            }
+            if (message is MessageRequestResponse) {
+                message.profile = storage.getUserProfile()
            }
            // Convert it to protobuf
            val proto = message.toProto() ?: throw Error.ProtoConversionFailed
@@ -257,14 +248,7 @@ object MessageSender {
        try {
            // Attach the user's profile if needed
            if (message is VisibleMessage) {
-                val displayName = storage.getUserDisplayName()!!
-                val profileKey = storage.getUserProfileKey()
-                val profilePictureUrl = storage.getUserProfilePictureURL()
-                if (profileKey != null && profilePictureUrl != null) {
-                    message.profile = Profile(displayName, profileKey, profilePictureUrl)
-                } else {
-                    message.profile = Profile(displayName)
-                }
+                message.profile = storage.getUserProfile()
            }
            when (destination) {
                is Destination.OpenGroup -> {
@@ -337,6 +321,8 @@ object MessageSender {
            message.serverHash?.let {
                storage.setMessageServerHash(messageID, it)
            }
+            // in case any errors from previous sends
+            storage.clearErrorMessage(messageID)
            // Track the open group server message ID
            if (message.openGroupServerMessageID != null && (destination is Destination.LegacyOpenGroup || destination is Destination.OpenGroup)) {
                val server: String
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@@ -189,22 +189,24 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) {
    storage.addContacts(message.contacts)
 }

-fun MessageReceiver.handleUnsendRequest(message: UnsendRequest) {
+fun MessageReceiver.handleUnsendRequest(message: UnsendRequest): Long? {
    val userPublicKey = MessagingModuleConfiguration.shared.storage.getUserPublicKey()
-    if (message.sender != message.author && (message.sender != userPublicKey && userPublicKey != null)) { return }
+    if (message.sender != message.author && (message.sender != userPublicKey && userPublicKey != null)) { return null }
    val context = MessagingModuleConfiguration.shared.context
    val storage = MessagingModuleConfiguration.shared.storage
    val messageDataProvider = MessagingModuleConfiguration.shared.messageDataProvider
-    val timestamp = message.timestamp ?: return
-    val author = message.author ?: return
-    val messageIdToDelete = storage.getMessageIdInDatabase(timestamp, author) ?: return
+    val timestamp = message.timestamp ?: return null
+    val author = message.author ?: return null
+    val messageIdToDelete = storage.getMessageIdInDatabase(timestamp, author) ?: return null
    messageDataProvider.getServerHashForMessage(messageIdToDelete)?.let { serverHash ->
        SnodeAPI.deleteMessage(author, listOf(serverHash))
    }
-    messageDataProvider.updateMessageAsDeleted(timestamp, author)
+    val deletedMessageId = messageDataProvider.updateMessageAsDeleted(timestamp, author)
    if (!messageDataProvider.isOutgoingMessage(messageIdToDelete)) {
        SSKEnvironment.shared.notificationManager.updateNotification(context)
    }
+
+    return deletedMessageId
 }

 fun handleMessageRequestResponse(message: MessageRequestResponse) {
@@ -264,6 +266,7 @@ fun MessageReceiver.handleVisibleMessage(message: VisibleMessage,
    }
    // Parse quote if needed
    var quoteModel: QuoteModel? = null
+    var quoteMessageBody: String? = null
    if (message.quote != null && proto.dataMessage.hasQuote()) {
        val quote = proto.dataMessage.quote

@@ -275,6 +278,7 @@ fun MessageReceiver.handleVisibleMessage(message: VisibleMessage,

        val messageDataProvider = MessagingModuleConfiguration.shared.messageDataProvider
        val messageInfo = messageDataProvider.getMessageForQuote(quote.id, author)
+        quoteMessageBody = messageInfo?.third
        quoteModel = if (messageInfo != null) {
            val attachments = if (messageInfo.second) messageDataProvider.getAttachmentsAndLinkPreviewFor(messageInfo.first) else ArrayList()
            QuoteModel(quote.id, author,null,false, attachments)
@@ -307,6 +311,8 @@ fun MessageReceiver.handleVisibleMessage(message: VisibleMessage,
            return@mapNotNull attachment
        }
    }
+    // Cancel any typing indicators if needed
+    cancelTypingIndicatorsIfNeeded(message.sender!!)
    // Parse reaction if needed
    val threadIsGroup = threadRecipient?.isGroupRecipient == true
    message.reaction?.let { reaction ->
@@ -319,6 +325,20 @@ fun MessageReceiver.handleVisibleMessage(message: VisibleMessage,
            storage.removeReaction(reaction.emoji!!, reaction.timestamp!!, reaction.publicKey!!, threadIsGroup)
        }
    } ?: run {
+        // A user is mentioned if their public key is in the body of a message or one of their messages
+        // was quoted
+        val messageText = message.text
+        message.hasMention = listOf(userPublicKey, userBlindedKey)
+            .filterNotNull()
+            .any { key ->
+                return@any (
+                    messageText != null &&
+                    messageText.contains("@$key")
+                ) || (
+                    (quoteModel?.author?.serialize() ?: "") == key
+                )
+            }
+
        // Persist the message
        message.threadID = threadID
        val messageID =
@@ -332,8 +352,6 @@ fun MessageReceiver.handleVisibleMessage(message: VisibleMessage,
        }
        return messageID
    }
-    // Cancel any typing indicators if needed
-    cancelTypingIndicatorsIfNeeded(message.sender!!)
    return null
 }

@@ -423,7 +441,7 @@ private fun MessageReceiver.handleClosedGroupControlMessage(message: ClosedGroup
 private fun MessageReceiver.handleNewClosedGroup(message: ClosedGroupControlMessage) {
    val kind = message.kind!! as? ClosedGroupControlMessage.Kind.New ?: return
    val recipient = Recipient.from(MessagingModuleConfiguration.shared.context, Address.fromSerialized(message.sender!!), false)
-    if (!recipient.isApproved) return
+    if (!recipient.isApproved && !recipient.isLocalNumber) return
    val groupPublicKey = kind.publicKey.toByteArray().toHexString()
    val members = kind.members.map { it.toByteArray().toHexString() }
    val admins = kind.admins.map { it.toByteArray().toHexString() }
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java
@@ -13,6 +13,7 @@ import org.session.libsignal.utilities.JsonUtil;
 import org.session.libsignal.utilities.guava.Optional;

 import java.io.IOException;
+import java.util.Objects;

 public class LinkPreview {

@@ -75,4 +76,17 @@ public class LinkPreview {
  public static LinkPreview deserialize(@NonNull String serialized) throws IOException {
    return JsonUtil.fromJson(serialized, LinkPreview.class);
  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    LinkPreview that = (LinkPreview) o;
+    return Objects.equals(url, that.url) && Objects.equals(title, that.title) && Objects.equals(attachmentId, that.attachmentId) && Objects.equals(thumbnail, that.thumbnail);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(url, title, attachmentId, thumbnail);
+  }
 }
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt
@@ -59,7 +59,7 @@ class OpenGroupPoller(private val server: String, private val executorService: S
    fun poll(isPostCapabilitiesRetry: Boolean = false): Promise<Unit, Exception> {
        val storage = MessagingModuleConfiguration.shared.storage
        val rooms = storage.getAllOpenGroups().values.filter { it.server == server }.map { it.room }
-        rooms.forEach { downloadGroupAvatarIfNeeded(it) }
+
        return OpenGroupApi.poll(rooms, server).successBackground { responses ->
            responses.filterNot { it.body == null }.forEach { response ->
                when (response.endpoint) {
@@ -117,15 +117,18 @@ class OpenGroupPoller(private val server: String, private val executorService: S
    ) {
        val storage = MessagingModuleConfiguration.shared.storage
        val groupId = "$server.$roomToken"
+        val dbGroupId = GroupUtil.getEncodedOpenGroupID(groupId.toByteArray())

        val existingOpenGroup = storage.getOpenGroup(roomToken, server)
        val publicKey = existingOpenGroup?.publicKey ?: return
        val openGroup = OpenGroup(
            server = server,
            room = pollInfo.token,
-            name = pollInfo.details?.name ?: "",
-            infoUpdates = pollInfo.details?.infoUpdates ?: 0,
+            name = if (pollInfo.details != null) { pollInfo.details.name } else { existingOpenGroup.name },
            publicKey = publicKey,
+            imageId = if (pollInfo.details != null) { pollInfo.details.imageId } else { existingOpenGroup.imageId },
+            canWrite = pollInfo.write,
+            infoUpdates = if (pollInfo.details != null) { pollInfo.details.infoUpdates } else { existingOpenGroup.infoUpdates }
        )
        // - Open Group changes
        storage.updateOpenGroup(openGroup)
@@ -155,6 +158,22 @@ class OpenGroupPoller(private val server: String, private val executorService: S
                GroupMember(groupId, it, GroupMemberRole.HIDDEN_ADMIN)
            })
        }
+
+        if (
+            (
+                pollInfo.details != null &&
+                pollInfo.details.imageId != null && (
+                    pollInfo.details.imageId != existingOpenGroup.imageId ||
+                    !storage.hasDownloadedProfilePicture(dbGroupId)
+                )
+            ) || (
+                pollInfo.details == null &&
+                existingOpenGroup.imageId != null &&
+                !storage.hasDownloadedProfilePicture(dbGroupId)
+            )
+        ) {
+            JobQueue.shared.add(GroupAvatarDownloadJob(roomToken, server))
+        }
    }

    private fun handleMessages(
@@ -284,16 +303,4 @@ class OpenGroupPoller(private val server: String, private val executorService: S
            JobQueue.shared.add(deleteJob)
        }
    }
-
-    private fun downloadGroupAvatarIfNeeded(room: String) {
-        val storage = MessagingModuleConfiguration.shared.storage
-        if (storage.getGroupAvatarDownloadJob(server, room) != null) return
-        val groupId = GroupUtil.getEncodedOpenGroupID("$server.$room".toByteArray())
-        storage.getGroup(groupId)?.let {
-            if (System.currentTimeMillis() > it.updatedTimestamp + TimeUnit.DAYS.toMillis(7)) {
-                JobQueue.shared.add(GroupAvatarDownloadJob(room, server))
-            }
-        }
-    }
-
 }
--- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
@@ -78,8 +78,8 @@ object OnionRequestAPI {
    // endregion

    class HTTPRequestFailedBlindingRequiredException(statusCode: Int, json: Map<*, *>, destination: String): HTTPRequestFailedAtDestinationException(statusCode, json, destination)
-    open class HTTPRequestFailedAtDestinationException(val statusCode: Int, val json: Map<*, *>, val destination: String)
-        : Exception("HTTP request failed at destination ($destination) with status code $statusCode.")
+    open class HTTPRequestFailedAtDestinationException(statusCode: Int, json: Map<*, *>, val destination: String)
+        : HTTP.HTTPRequestFailedException(statusCode, json, "HTTP request failed at destination ($destination) with status code $statusCode.")
    class InsufficientSnodesException : Exception("Couldn't find enough snodes to build a path.")

    private data class OnionBuildingResult(
--- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
@@ -55,6 +55,10 @@ object SnodeAPI {
     * user's clock is incorrect.
     */
    internal var clockOffset = 0L
+
+    val nowWithOffset
+        get() = System.currentTimeMillis() + clockOffset
+
    internal var forkInfo by observable(database.getForkInfo()) { _, oldValue, newValue ->
        if (newValue > oldValue) {
            Log.d("Loki", "Setting new fork info new: $newValue, old: $oldValue")
--- a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt
@@ -2,6 +2,7 @@ package org.session.libsession.utilities

 import okhttp3.HttpUrl
 import org.session.libsession.messaging.file_server.FileServerApi
+import org.session.libsignal.utilities.HTTP
 import org.session.libsignal.utilities.Log
 import java.io.*

@@ -40,7 +41,11 @@ object DownloadUtilities {
                outputStream.write(it)
            }
        } catch (e: Exception) {
-            Log.e("Loki", "Couldn't download attachment.", e)
+            when (e) {
+                // No need for the stack trace for HTTP errors
+                is HTTP.HTTPRequestFailedException -> Log.e("Loki", "Couldn't download attachment due to error: ${e.message}")
+                else -> Log.e("Loki", "Couldn't download attachment", e)
+            }
            throw e
        }
    }