|
|
@ -1,6 +1,5 @@
|
|
|
|
package org.thoughtcrime.securesms.database
|
|
|
|
package org.thoughtcrime.securesms.database
|
|
|
|
|
|
|
|
|
|
|
|
import android.app.job.JobScheduler
|
|
|
|
|
|
|
|
import android.content.Context
|
|
|
|
import android.content.Context
|
|
|
|
import android.net.Uri
|
|
|
|
import android.net.Uri
|
|
|
|
import org.session.libsession.database.StorageProtocol
|
|
|
|
import org.session.libsession.database.StorageProtocol
|
|
|
@ -105,7 +104,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else -> Optional.absent()
|
|
|
|
else -> Optional.absent()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
val pointerAttachments = attachments.mapNotNull {
|
|
|
|
val pointers = attachments.mapNotNull {
|
|
|
|
it.toSignalAttachment()
|
|
|
|
it.toSignalAttachment()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
val targetAddress = if (isUserSender && !message.syncTarget.isNullOrEmpty()) {
|
|
|
|
val targetAddress = if (isUserSender && !message.syncTarget.isNullOrEmpty()) {
|
|
|
@ -121,7 +120,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
|
|
|
|
val linkPreviews: Optional<List<LinkPreview>> = if (linkPreview.isEmpty()) Optional.absent() else Optional.of(linkPreview.mapNotNull { it!! })
|
|
|
|
val linkPreviews: Optional<List<LinkPreview>> = if (linkPreview.isEmpty()) Optional.absent() else Optional.of(linkPreview.mapNotNull { it!! })
|
|
|
|
val mmsDatabase = DatabaseFactory.getMmsDatabase(context)
|
|
|
|
val mmsDatabase = DatabaseFactory.getMmsDatabase(context)
|
|
|
|
val insertResult = if (message.sender == getUserPublicKey()) {
|
|
|
|
val insertResult = if (message.sender == getUserPublicKey()) {
|
|
|
|
val mediaMessage = OutgoingMediaMessage.from(message, targetRecipient, pointerAttachments, quote.orNull(), linkPreviews.orNull()?.firstOrNull())
|
|
|
|
val mediaMessage = OutgoingMediaMessage.from(message, targetRecipient, pointers, quote.orNull(), linkPreviews.orNull()?.firstOrNull())
|
|
|
|
mmsDatabase.insertSecureDecryptedMessageOutbox(mediaMessage, message.threadID ?: -1, message.sentTimestamp!!)
|
|
|
|
mmsDatabase.insertSecureDecryptedMessageOutbox(mediaMessage, message.threadID ?: -1, message.sentTimestamp!!)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
// It seems like we have replaced SignalServiceAttachment with SessionServiceAttachment
|
|
|
|
// It seems like we have replaced SignalServiceAttachment with SessionServiceAttachment
|
|
|
|