From bdc086cacfd1ded4c9624d142424dceb25128cdc Mon Sep 17 00:00:00 2001 From: jubb Date: Thu, 25 Mar 2021 14:11:58 +1100 Subject: [PATCH] fix: use message's expiry instead of the recipient's --- .../main/java/org/thoughtcrime/securesms/database/Storage.kt | 4 ++-- .../libsession/messaging/messages/visible/VisibleMessage.kt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 610bde1bed..5f021a3f9c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -131,7 +131,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, val signalServiceAttachments = attachments.mapNotNull { it.toSignalPointer() } - val mediaMessage = IncomingMediaMessage.from(message, senderAddress, senderRecipient.expireMessages * 1000L, group, signalServiceAttachments, quote, linkPreviews) + val mediaMessage = IncomingMediaMessage.from(message, senderAddress, message.expiry * 1000L, group, signalServiceAttachments, quote, linkPreviews) mmsDatabase.beginTransaction() mmsDatabase.insertSecureDecryptedMessageInbox(mediaMessage, message.threadID ?: -1, message.sentTimestamp ?: 0) } @@ -156,7 +156,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, val textMessage = OutgoingTextMessage.from(message, Recipient.from(context, targetAddress, false)) smsDatabase.insertMessageOutbox(message.threadID ?: -1, textMessage, message.sentTimestamp!!) } else { - val textMessage = IncomingTextMessage.from(message, senderAddress, group, senderRecipient.expireMessages * 1000L) + val textMessage = IncomingTextMessage.from(message, senderAddress, group, message.expiry * 1000L) val encrypted = IncomingEncryptedMessage(textMessage, textMessage.messageBody) smsDatabase.insertMessageInbox(encrypted, message.sentTimestamp ?: 0) } diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt index 0b2c4b59e8..7863896e3f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt @@ -20,6 +20,7 @@ class VisibleMessage : Message() { var linkPreview: LinkPreview? = null var contact: Contact? = null var profile: Profile? = null + var expiry: Int = 0 override val isSelfSendValid: Boolean = true @@ -47,6 +48,9 @@ class VisibleMessage : Message() { // TODO Contact val profile = Profile.fromProto(dataMessage) profile?.let { result.profile = profile } + if (dataMessage.hasExpireTimer()) { + result.expiry = dataMessage.expireTimer + } return result } }