WIP: make attachment work

2025-08-11 20:47:42 +00:00 · 2021-03-02 17:22:56 +11:00
parent 4a9ac91e5f
commit 0ea1ed15e7
10 changed files with 52 additions and 38 deletions
--- a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
+++ b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
@@ -1,10 +1,8 @@
 package org.session.libsession.database

-import org.session.libsession.messaging.sending_receiving.attachments.Attachment
-import org.session.libsession.messaging.sending_receiving.attachments.AttachmentState
-import org.session.libsession.messaging.sending_receiving.attachments.SessionServiceAttachmentPointer
-import org.session.libsession.messaging.sending_receiving.attachments.SessionServiceAttachmentStream
+import org.session.libsession.messaging.sending_receiving.attachments.*
 import org.session.libsession.messaging.threads.Address
+import org.session.libsession.messaging.utilities.DotNetAPI
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream
 import java.io.InputStream
@@ -14,6 +12,8 @@ interface MessageDataProvider {
    fun getMessageID(serverID: Long): Long?
    fun deleteMessage(messageID: Long)

+    fun getDatabaseAttachment(attachmentId: Long): DatabaseAttachment?
+
    fun getAttachmentStream(attachmentId: Long): SessionServiceAttachmentStream?
    fun getAttachmentPointer(attachmentId: Long): SessionServiceAttachmentPointer?

@@ -26,12 +26,14 @@ interface MessageDataProvider {

    fun isOutgoingMessage(timestamp: Long): Boolean

-    @Throws(Exception::class)
-    fun uploadAttachment(attachmentId: Long)
+    fun updateAttachmentAfterUploadSucceeded(attachmentId: Long, uploadResult: DotNetAPI.UploadResult)
+    fun updateAttachmentAfterUploadFailed(attachmentId: Long)

    // Quotes
    fun getMessageForQuote(timestamp: Long, author: Address): Long?
    fun getAttachmentsAndLinkPreviewFor(messageID: Long): List<Attachment>
    fun getMessageBodyFor(messageID: Long): String

+    fun getAttachmentIDsFor(messageID: Long): List<Long>
+
 }
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
@@ -58,7 +58,8 @@ class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val mess

            val attachmentData = PushAttachmentData(attachmentStream.contentType, attachmentStream.inputStream, ciphertextLength, outputStreamFactory, attachmentStream.listener)

-            FileServerAPI.shared.uploadAttachment(server, attachmentData)
+            val uploadResult = FileServerAPI.shared.uploadAttachment(server, attachmentData)
+            handleSuccess(uploadResult)

        } catch (e: java.lang.Exception) {
            if (e is Error && e == Error.NoAttachment) {
@@ -71,11 +72,11 @@ class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val mess
        }
    }

-    private fun handleSuccess() {
+    private fun handleSuccess(uploadResult: DotNetAPI.UploadResult) {
        Log.w(TAG, "Attachment uploaded successfully.")
        delegate?.handleJobSucceeded(this)
+        //TODO: handle success in database
        MessagingConfiguration.shared.storage.resumeMessageSendJobIfNeeded(messageSendJobID)
-        //TODO interaction stuff, not sure how to deal with that
    }

    private fun handlePermanentFailure(e: Exception) {
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
@@ -32,13 +32,13 @@ class MessageSendJob(val message: Message, val destination: Destination) : Job {
        val message = message as? VisibleMessage
        message?.let {
            if(!messageDataProvider.isOutgoingMessage(message.sentTimestamp!!)) return // The message has been deleted
-            val attachments = message.attachmentIDs.map { messageDataProvider.getAttachmentStream(it) }.filterNotNull()
-            val attachmentsToUpload = attachments.filter { !it.isUploaded }
+            val attachments = message.attachmentIDs.map { messageDataProvider.getDatabaseAttachment(it) }.filterNotNull()
+            val attachmentsToUpload = attachments.filter { it.url.isNullOrEmpty() }
            attachmentsToUpload.forEach {
-                if(MessagingConfiguration.shared.storage.getAttachmentUploadJob(it.attachmentId) != null) {
+                if (MessagingConfiguration.shared.storage.getAttachmentUploadJob(it.attachmentId.rowId) != null) {
                    // Wait for it to finish
                } else {
-                    val job = AttachmentUploadJob(it.attachmentId, message.threadID!!.toString(), message, id!!)
+                    val job = AttachmentUploadJob(it.attachmentId.rowId, message.threadID!!.toString(), message, id!!)
                    JobQueue.shared.add(job)
                }
            }
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt
@@ -2,8 +2,9 @@ package org.session.libsession.messaging.messages.visible

 import android.util.Size
 import android.webkit.MimeTypeMap
-import org.session.libsession.database.MessageDataProvider
+import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
+import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment
 import org.session.libsignal.service.internal.push.SignalServiceProtos
 import java.io.File

@@ -66,8 +67,9 @@ class Attachment {
        TODO("Not implemented")
    }

-    fun toDatabaseAttachment(): org.session.libsession.messaging.sending_receiving.attachments.Attachment {
-        return DatabaseAttachment(null, 0, true, true, contentType, 0,
+    fun toSignalAttachment(): SignalAttachment? {
+        if (!isValid()) return null
+        return DatabaseAttachment(null, 0, false, false, contentType, 0,
                sizeInBytes?.toLong() ?: 0, fileName, null, key.toString(), null, digest, null, kind == Kind.VOICE_MESSAGE,
                size?.width ?: 0, size?.height ?: 0, false, caption, url)
    }
--- 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
@@ -74,8 +74,7 @@ object MessageSender {
            attachment.size = Size(signalAttachment.width, signalAttachment.height)
            attachments.add(attachment)
        }
-        val attachmentIDs = MessagingConfiguration.shared.storage.persistAttachments(message.id
-                ?: 0, attachments)
+        val attachmentIDs = MessagingConfiguration.shared.messageDataProvider.getAttachmentIDsFor(message.id!!)
        message.attachmentIDs.addAll(attachmentIDs)
    }

@@ -94,7 +93,6 @@ object MessageSender {
        val storage = MessagingConfiguration.shared.storage
        val userPublicKey = storage.getUserPublicKey()
        val preconditionFailure = Exception("Destination should not be open groups!")
-        var snodeMessage: SnodeMessage? = null
        // Set the timestamp, sender and recipient
        message.sentTimestamp ?: run { message.sentTimestamp = System.currentTimeMillis() } /* Visible messages will already have their sent timestamp set */
        message.sender = userPublicKey
@@ -109,7 +107,7 @@ object MessageSender {
            fun handleFailure(error: Exception) {
                handleFailedMessageSend(message, error)
                if (destination is Destination.Contact && message is VisibleMessage && !isSelfSend) {
-                    //TODO Notify user for send failure
+                    SnodeConfiguration.shared.broadcaster.broadcast("messageFailed", message.sentTimestamp!!)
                }
                deferred.reject(error)
            }
@@ -142,9 +140,6 @@ object MessageSender {
            // Serialize the protobuf
            val plaintext = proto.toByteArray()
            // Encrypt the serialized protobuf
-            if (destination is Destination.Contact && message is VisibleMessage && !isSelfSend) {
-                //TODO Notify user for encrypting message
-            }
            val ciphertext: ByteArray
            when (destination) {
                is Destination.Contact -> ciphertext = MessageSenderEncryption.encryptWithSessionProtocol(plaintext, destination.publicKey)
@@ -178,7 +173,7 @@ object MessageSender {
            val timestamp = System.currentTimeMillis()
            val nonce = ProofOfWork.calculate(base64EncodedData, recipient, timestamp, message.ttl.toInt()) ?: throw Error.ProofOfWorkCalculationFailed
            // Send the result
-            snodeMessage = SnodeMessage(recipient, base64EncodedData, message.ttl, timestamp, nonce)
+            val snodeMessage = SnodeMessage(recipient, base64EncodedData, message.ttl, timestamp, nonce)
            if (destination is Destination.Contact && message is VisibleMessage && !isSelfSend) {
                SnodeConfiguration.shared.broadcaster.broadcast("sendingMessage", message.sentTimestamp!!)
            }
@@ -299,7 +294,6 @@ object MessageSender {
    fun handleFailedMessageSend(message: Message, error: Exception) {
        val storage = MessagingConfiguration.shared.storage
        storage.setErrorMessage(message.sentTimestamp!!, message.sender!!, error)
-        SnodeConfiguration.shared.broadcaster.broadcast("messageFailed", message.sentTimestamp!!)
    }

    // Convenience