use of SessionServiceAttachment instead if SignalSA

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt

@@ -2,27 +2,35 @@ package org.thoughtcrime.securesms.attachments
 
 import android.content.Context
 import com.google.protobuf.ByteString
-import org.session.libsession.database.dto.DatabaseAttachmentDTO
 import org.session.libsession.database.MessageDataProvider
 import org.session.libsession.database.dto.AttachmentState
-import org.session.libsignal.service.internal.push.SignalServiceProtos
+import org.session.libsession.messaging.sending_receiving.attachments.SessionServiceAttachmentPointer
+import org.session.libsession.messaging.sending_receiving.attachments.SessionServiceAttachmentStream
+import org.session.libsignal.libsignal.util.guava.Optional
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.database.SmsDatabase
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.jobs.AttachmentUploadJob
+import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.util.MediaUtil
 
 class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), MessageDataProvider {
-    override fun getAttachment(attachmentId: Long): DatabaseAttachmentDTO? {
+
+    override fun getAttachmentStream(attachmentId: Long): SessionServiceAttachmentStream? {
         val attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context)
         val databaseAttachment = attachmentDatabase.getAttachment(AttachmentId(attachmentId, 0)) ?: return null
-        return databaseAttachment.toDTO()
+        return databaseAttachment.toAttachmentStream(context)
     }
 
-    override fun setAttachmentState(attachmentState: AttachmentState, attachment: DatabaseAttachmentDTO, messageID: Long) {
+    override fun getAttachmentPointer(attachmentId: Long): SessionServiceAttachmentPointer? {
         val attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context)
-        attachmentDatabase.setTransferState(messageID, AttachmentId(attachment.attachmentId, 0), attachmentState.value)
+        val databaseAttachment = attachmentDatabase.getAttachment(AttachmentId(attachmentId, 0)) ?: return null
+        return databaseAttachment.toAttachmentPointer()
+    }
+
+    override fun setAttachmentState(attachmentState: AttachmentState, attachmentId: Long, messageID: Long) {
+        val attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context)
+        attachmentDatabase.setTransferState(messageID, AttachmentId(attachmentId, 0), attachmentState.value)
     }
 
     @Throws(Exception::class)
@@ -38,29 +46,26 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
 
 }
 
-// Extension to DatabaseAttachment class
+fun DatabaseAttachment.toAttachmentPointer(): SessionServiceAttachmentPointer {
+    return SessionServiceAttachmentPointer(attachmentId.rowId, contentType, key?.toByteArray(), Optional.fromNullable(size.toInt()), Optional.absent(), width, height, Optional.fromNullable(digest), Optional.fromNullable(fileName), isVoiceNote, Optional.fromNullable(caption), url)
+}
 
-fun DatabaseAttachment.toDTO(): DatabaseAttachmentDTO {
+fun DatabaseAttachment.toAttachmentStream(context: Context): SessionServiceAttachmentStream {
-    var databaseAttachmentDTO = DatabaseAttachmentDTO()
+    val stream = PartAuthority.getAttachmentStream(context, this.dataUri!!)
-    databaseAttachmentDTO.attachmentId = this.attachmentId.rowId
+    var attachmentStream = SessionServiceAttachmentStream(stream, this.contentType, this.size, Optional.fromNullable(this.fileName), this.isVoiceNote, Optional.absent(), this.width, this.height, Optional.fromNullable(this.caption), null)
-    databaseAttachmentDTO.contentType = this.contentType
+    attachmentStream.attachmentId = this.attachmentId.rowId
-    databaseAttachmentDTO.fileName = this.fileName
+    attachmentStream.isAudio = MediaUtil.isAudio(this)
-    databaseAttachmentDTO.caption = this.caption
+    attachmentStream.isGif = MediaUtil.isGif(this)
+    attachmentStream.isVideo = MediaUtil.isVideo(this)
+    attachmentStream.isImage = MediaUtil.isImage(this)
 
-    databaseAttachmentDTO.size = this.size.toInt()
+    attachmentStream.key = ByteString.copyFrom(this.key?.toByteArray())
-    databaseAttachmentDTO.key = ByteString.copyFrom(this.key?.toByteArray())
+    attachmentStream.digest = this.digest
-    databaseAttachmentDTO.digest = ByteString.copyFrom(this.digest)
+    //attachmentStream.flags = if (this.isVoiceNote) SignalServiceProtos.AttachmentPointer.Flags.VOICE_MESSAGE.number else 0
-    databaseAttachmentDTO.flags = if (this.isVoiceNote) SignalServiceProtos.AttachmentPointer.Flags.VOICE_MESSAGE.number else 0
 
-    databaseAttachmentDTO.url = this.url
+    attachmentStream.url = this.url
 
-    if (this.shouldHaveImageSize()) {
+    return attachmentStream
-        databaseAttachmentDTO.shouldHaveImageSize = true
-        databaseAttachmentDTO.width = this.width
-        databaseAttachmentDTO.height = this.height
-    }
-
-    return databaseAttachmentDTO
 }
 
 fun DatabaseAttachment.shouldHaveImageSize(): Boolean {

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

@@ -1,14 +1,18 @@
 package org.session.libsession.database
 
-import org.session.libsession.database.dto.AttachmentState
+import org.session.libsession.messaging.sending_receiving.attachments.AttachmentState
-import org.session.libsession.database.dto.DatabaseAttachmentDTO
+import org.session.libsession.messaging.sending_receiving.attachments.SessionServiceAttachmentPointer
-import org.session.libsession.messaging.messages.visible.Attachment
+import org.session.libsession.messaging.sending_receiving.attachments.SessionServiceAttachmentStream
 
 interface MessageDataProvider {
 
-    fun getAttachment(attachmentId: Long): DatabaseAttachmentDTO?
+    //fun getAttachment(attachmentId: Long): SignalServiceAttachmentStream?
 
-    fun setAttachmentState(attachmentState: AttachmentState, attachment: DatabaseAttachmentDTO, messageID: Long)
+    fun getAttachmentStream(attachmentId: Long): SessionServiceAttachmentStream?
+
+    fun getAttachmentPointer(attachmentId: Long): SessionServiceAttachmentPointer?
+
+    fun setAttachmentState(attachmentState: AttachmentState, attachmentId: Long, messageID: Long)
 
     fun isOutgoingMessage(timestamp: Long): Boolean
 

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

@@ -27,7 +27,7 @@ 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.getAttachment(it) }.filterNotNull()
+            val attachments = message.attachmentIDs.map { messageDataProvider.getAttachmentStream(it) }.filterNotNull()
             val attachmentsToUpload = attachments.filter { !it.isUploaded }
             attachmentsToUpload.forEach {
                 if(MessagingConfiguration.shared.storage.getAttachmentUploadJob(it.attachmentId) != null) {

libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt

@@ -44,7 +44,7 @@ class LinkPreview() {
         title?.let { linkPreviewProto.title = title }
         val attachmentID = attachmentID
         attachmentID?.let {
-            val attachmentProto = MessagingConfiguration.shared.messageDataProvider.getAttachment(attachmentID)
+            val attachmentProto = MessagingConfiguration.shared.messageDataProvider.getAttachmentStream(attachmentID)
             attachmentProto?.let { linkPreviewProto.image = attachmentProto.toProto() }
         }
         // Build

libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt

@@ -60,7 +60,7 @@ class Quote() {
 
     private fun addAttachmentsIfNeeded(quoteProto: SignalServiceProtos.DataMessage.Quote.Builder, messageDataProvider: MessageDataProvider) {
         val attachmentID = attachmentID ?: return
-        val attachmentProto = messageDataProvider.getAttachment(attachmentID)
+        val attachmentProto = messageDataProvider.getAttachmentStream(attachmentID)
         if (attachmentProto == null) {
             Log.w(TAG, "Ignoring invalid attachment for quoted message.")
             return
@@ -74,7 +74,7 @@ class Quote() {
         }
         val quotedAttachmentProto = SignalServiceProtos.DataMessage.Quote.QuotedAttachment.newBuilder()
         quotedAttachmentProto.contentType = attachmentProto.contentType
-        val fileName = attachmentProto.fileName
+        val fileName = attachmentProto.fileName?.get()
         fileName?.let { quotedAttachmentProto.fileName = fileName }
         quotedAttachmentProto.thumbnail = attachmentProto.toProto()
         try {

libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt

@@ -90,7 +90,7 @@ class VisibleMessage : Message()  {
             }
         }
         //Attachments
-        val attachments = attachmentIDs.mapNotNull { MessagingConfiguration.shared.messageDataProvider.getAttachment(it) }
+        val attachments = attachmentIDs.mapNotNull { MessagingConfiguration.shared.messageDataProvider.getAttachmentStream(it) }
         if (!attachments.all { it.isUploaded }) {
             if (BuildConfig.DEBUG) {
                 //TODO equivalent to iOS's preconditionFailure