Merge pull request #1615 from session-foundation/merge/1.28.2-pt2

1.28.2 into dev

Author: ThomasSession

app/src/main/AndroidManifest.xml

@@ -432,10 +432,7 @@
             </intent-filter>
         </receiver>
         <receiver android:name="org.thoughtcrime.securesms.notifications.DeleteNotificationReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="network.loki.securesms.DELETE_NOTIFICATION" />
-            </intent-filter>
+            android:exported="false">
         </receiver>
         <receiver
             android:name="org.thoughtcrime.securesms.service.PanicResponderListener"

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

@@ -181,7 +181,7 @@ interface StorageProtocol {
         attachments: List<Attachment>,
         runThreadUpdate: Boolean
     ): MessageId?
-    fun markConversationAsRead(threadId: Long, lastSeenTime: Long, force: Boolean = false)
+    fun markConversationAsRead(threadId: Long, lastSeenTime: Long, force: Boolean = false, updateNotification: Boolean = true)
     fun markConversationAsUnread(threadId: Long)
     fun getLastSeen(threadId: Long): Long
     fun ensureMessageHashesAreSender(hashes: Set<String>, sender: String, closedGroupId: String): Boolean

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

@@ -14,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.DownloadUtilities
@@ -167,7 +166,7 @@ class AttachmentDownloadJob @AssistedInject constructor(
                 Log.d("AttachmentDownloadJob", "downloading open group attachment")
                 val url = attachment.url.toHttpUrlOrNull()!!
                 val fileID = url.pathSegments.last()
-                OpenGroupApi.download(fileID, room = threadRecipient.address.room, server = threadRecipient.address.serverUrl).await()
+                OpenGroupApi.download(fileID, room = threadRecipient.address.room, server = threadRecipient.address.serverUrl)
             }
 
             tempFile = createTempFile().also { file ->

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

@@ -80,8 +80,8 @@ class AttachmentUploadJob @AssistedInject constructor(
                 }
                 handleSuccess(dispatcherName, attachment, keyAndResult.first, keyAndResult.second)
             } else {
-                val keyAndResult = upload(attachment, FileServerApi.FILE_SERVER_URL, true) {
-                    FileServerApi.upload(it).map { it.fileId }
+                val keyAndResult = upload(attachment, FileServerApi.FILE_SERVER_URL, true) { file ->
+                    FileServerApi.upload(file).map { it.fileId }.await()
                 }
                 handleSuccess(dispatcherName, attachment, keyAndResult.first, keyAndResult.second)
             }
@@ -94,7 +94,7 @@ class AttachmentUploadJob @AssistedInject constructor(
         }
     }
 
-    private suspend fun upload(attachment: SignalServiceAttachmentStream, server: String, encrypt: Boolean, upload: (ByteArray) -> Promise<String, Exception>): Pair<ByteArray, UploadResult> {
+    private suspend fun upload(attachment: SignalServiceAttachmentStream, server: String, encrypt: Boolean, upload: suspend (ByteArray) -> String): Pair<ByteArray, UploadResult> {
         // Key
         val key = if (encrypt) Util.getSecretBytes(64) else ByteArray(0)
         // Length
@@ -120,7 +120,7 @@ class AttachmentUploadJob @AssistedInject constructor(
         drb.writeTo(b)
         val data = b.readByteArray()
         // Upload the data
-        val id = upload(data).await()
+        val id = upload(data)
         val digest = drb.transmittedDigest
         // Return
         return Pair(key, UploadResult(id, "${server}/file/$id", digest))

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

@@ -253,7 +253,7 @@ class BatchMessageReceiveJob @AssistedInject constructor(
                         }
 
                         is UnsendRequest -> {
-                            val deletedMessage = receivedMessageHandler.handleUnsendRequest(message)
+                            val deletedMessage = receivedMessageHandler.handleUnsendRequest(message, threadId)
 
                             // If we removed a message then ensure it isn't in the 'messageIds'
                             if (deletedMessage != null) {

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

@@ -16,7 +16,6 @@ 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.snode.utilities.await
 import org.session.libsession.utilities.getGroup
 import org.session.libsignal.protos.SignalServiceProtos.DataMessage.GroupUpdateInviteMessage
 import org.session.libsignal.protos.SignalServiceProtos.DataMessage.GroupUpdateMessage
@@ -78,7 +77,6 @@ class InviteContactsJob(val groupSessionId: String, val memberSessionIds: Array<
                         }
 
                         MessageSender.sendNonDurably(update, Destination.Contact(memberSessionId), false)
-                            .await()
                     }
                 }
             }

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

@@ -20,7 +20,6 @@ import org.session.libsession.messaging.messages.Message
 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.utilities.await
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.ConfigUpdateNotification
 import org.session.libsignal.utilities.AccountId
@@ -97,7 +96,7 @@ class MessageSendJob @AssistedInject constructor(
                         .waitForGroupEncryptionKeys(AccountId(destination.publicKey))
                 }
 
-                MessageSender.sendNonDurably(this@MessageSendJob.message, destination, isSync).await()
+                MessageSender.sendNonDurably(this@MessageSendJob.message, destination, isSync)
             }
 
             this.handleSuccess(dispatcherName)