Merge branch 'refactor' of https://github.com/RyanRory/loki-messenger-android into refactor

2025-08-11 14:57:45 +00:00 · 2020-12-15 17:22:05 +11:00
parent c0847fc563 3a10d8c1b4
commit d7b0c84f22
10 changed files with 181 additions and 63 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
@@ -1,52 +1,68 @@
-//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.libsignal.service.internal.push.SignalServiceProtos
-//import org.thoughtcrime.securesms.database.Database
-//import org.thoughtcrime.securesms.database.DatabaseFactory
-//import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
-//import org.thoughtcrime.securesms.util.MediaUtil
-//
-//class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), MessageDataProvider {
-//    override fun getAttachment(uniqueID: String): DatabaseAttachmentDTO? {
-//
-//        val attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context)
-//        val uniqueID = uniqueID.toLongOrNull() ?: return null
-//        val attachmentID = AttachmentId(0, uniqueID)
-//        val databaseAttachment = attachmentDatabase.getAttachment(attachmentID) ?: return null
-//
-//        return databaseAttachment.toDTO()
-//    }
-//
-//}
-//
-//// Extension to DatabaseAttachment class
-//
-//fun DatabaseAttachment.toDTO(): DatabaseAttachmentDTO {
-//    var databaseAttachmentDTO = DatabaseAttachmentDTO()
-//    databaseAttachmentDTO.contentType = this.contentType
-//    databaseAttachmentDTO.fileName = this.fileName
-//    databaseAttachmentDTO.caption = this.caption
-//
-//    databaseAttachmentDTO.size = this.size.toInt()
-//    databaseAttachmentDTO.key = ByteString.copyFrom(this.key?.toByteArray())
-//    databaseAttachmentDTO.digest = ByteString.copyFrom(this.digest)
-//    databaseAttachmentDTO.flags = if (this.isVoiceNote) SignalServiceProtos.AttachmentPointer.Flags.VOICE_MESSAGE.number else 0
-//
-//    databaseAttachmentDTO.url = this.url
-//
-//    if (this.shouldHaveImageSize()) {
-//        databaseAttachmentDTO.shouldHaveImageSize = true
-//        databaseAttachmentDTO.width = this.width
-//        databaseAttachmentDTO.height = this.height
-//    }
-//
-//    return databaseAttachmentDTO
-//}
-//
-//fun DatabaseAttachment.shouldHaveImageSize(): Boolean {
-//    return (MediaUtil.isVideo(this) || MediaUtil.isImage(this) || MediaUtil.isGif(this));
-//}
+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.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.util.MediaUtil
+
+class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), MessageDataProvider {
+    override fun getAttachment(attachmentId: Long): DatabaseAttachmentDTO? {
+        val attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context)
+        val databaseAttachment = attachmentDatabase.getAttachment(AttachmentId(attachmentId, 0)) ?: return null
+        return databaseAttachment.toDTO()
+    }
+
+    override fun setAttachmentState(attachmentState: AttachmentState, attachment: DatabaseAttachmentDTO, messageID: Long) {
+        val attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context)
+        attachmentDatabase.setTransferState(messageID, AttachmentId(attachment.attachmentId, 0), attachmentState.value)
+    }
+
+    @Throws(Exception::class)
+    override fun uploadAttachment(attachmentId: Long) {
+        val attachmentUploadJob = AttachmentUploadJob(AttachmentId(attachmentId, 0), null)
+        attachmentUploadJob.onRun()
+    }
+
+    override fun isOutgoingMessage(timestamp: Long): Boolean {
+        val smsDatabase = DatabaseFactory.getSmsDatabase(context)
+        return smsDatabase.isOutgoingMessage(timestamp)
+    }
+
+}
+
+// Extension to DatabaseAttachment class
+
+fun DatabaseAttachment.toDTO(): DatabaseAttachmentDTO {
+    var databaseAttachmentDTO = DatabaseAttachmentDTO()
+    databaseAttachmentDTO.attachmentId = this.attachmentId.rowId
+    databaseAttachmentDTO.contentType = this.contentType
+    databaseAttachmentDTO.fileName = this.fileName
+    databaseAttachmentDTO.caption = this.caption
+
+    databaseAttachmentDTO.size = this.size.toInt()
+    databaseAttachmentDTO.key = ByteString.copyFrom(this.key?.toByteArray())
+    databaseAttachmentDTO.digest = ByteString.copyFrom(this.digest)
+    databaseAttachmentDTO.flags = if (this.isVoiceNote) SignalServiceProtos.AttachmentPointer.Flags.VOICE_MESSAGE.number else 0
+
+    databaseAttachmentDTO.url = this.url
+
+    if (this.shouldHaveImageSize()) {
+        databaseAttachmentDTO.shouldHaveImageSize = true
+        databaseAttachmentDTO.width = this.width
+        databaseAttachmentDTO.height = this.height
+    }
+
+    return databaseAttachmentDTO
+}
+
+fun DatabaseAttachment.shouldHaveImageSize(): Boolean {
+    return (MediaUtil.isVideo(this) || MediaUtil.isImage(this) || MediaUtil.isGif(this));
+}