Disappearing messages fixes

Author: SessionHero01

app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt

@@ -367,6 +367,11 @@ class MmsDatabase
         contentValues.put(READ, 1)
         contentValues.put(BODY, displayedMessage)
         contentValues.put(HAS_MENTION, 0)
+
+        // Clear the expiration fields so that the "message is deleted" is never expired.
+        contentValues.put(EXPIRE_STARTED, 0)
+        contentValues.put(EXPIRES_IN, 0)
+
         database.update(TABLE_NAME, contentValues, ID_WHERE, arrayOf(messageId.toString()))
         val attachmentDatabase = get(context).attachmentDatabase()
         queue { attachmentDatabase.deleteAttachmentsForMessage(messageId) }

app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java

@@ -246,6 +246,10 @@ public void markAsDeleted(long messageId, boolean isOutgoing, String displayedMe
     contentValues.put(BODY, displayedMessage);
     contentValues.put(HAS_MENTION, 0);
     contentValues.put(STATUS, Status.STATUS_NONE);
+    // Clear the expiration fields so that the "message is deleted" is never expired.
+    contentValues.put(EXPIRE_STARTED, 0);
+    contentValues.put(EXPIRES_IN, 0);
+
     database.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(messageId)});
 
     updateTypeBitmask(messageId, Types.BASE_TYPE_MASK,

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -1694,7 +1694,7 @@ open class Storage @Inject constructor(
         val expirationConfig = getExpirationConfiguration(threadId)
         val expiryMode = expirationConfig?.expiryMode?.coerceSendToRead() ?: ExpiryMode.NONE
         val expiresInMillis = expiryMode.expiryMillis
-        val expireStartedAt = if (expiryMode is ExpiryMode.AfterSend) sentTimestamp else 0
+        val expireStartedAt = if (expiryMode != ExpiryMode.NONE) clock.currentTimeMills() else 0
         val callMessage = IncomingTextMessage.fromCallInfo(callMessageType, address, Optional.absent(), sentTimestamp, expiresInMillis, expireStartedAt)
         smsDatabase.insertCallMessage(callMessage)
     }

app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.kt

@@ -203,7 +203,6 @@ class ExpiringMessageManager @Inject constructor(
         }
     }
 
-
     override fun onMessageSent(message: Message) {
         // When a message is sent, we'll schedule deletion immediately if we have an expiry mode,
         // even if the expiry mode is set to AfterRead, as we don't have a reliable way to know
@@ -212,31 +211,22 @@ class ExpiringMessageManager @Inject constructor(
         // As for the receiver, they will be able to disappear the message correctly after
         // they've done reading it.
         val messageId = message.id
-        val sentTimestamp = message.sentTimestamp
-        if (message.expiryMode != ExpiryMode.NONE && messageId != null && sentTimestamp != null) {
-            // If the expiryMode is set to AfterRead, the start time must be greater than the sent timestamp.
-            // This is due to the assumption downstream that `expiryStarted == sentTimestamp` means expiryMode is AfterSend.
-            val startTime = if (message.expiryMode is ExpiryMode.AfterRead) {
-                sentTimestamp + 1 // Ensure start time is after sent timestamp
-            } else {
-                sentTimestamp
-            }
-
-            getDatabase(messageId.mms).markExpireStarted(messageId.id, startTime)
+        if (message.expiryMode != ExpiryMode.NONE && messageId != null) {
+            getDatabase(messageId.mms)
+                .markExpireStarted(messageId.id, clock.currentTimeMills())
         }
     }
 
     override fun onMessageReceived(message: Message) {
         // When we receive a message, we'll schedule deletion if it has an expiry mode set to
         // AfterSend, as the message would be considered sent from the sender's perspective.
         val messageId = message.id
-        val sentTimestamp = message.sentTimestamp
-        if (message.expiryMode is ExpiryMode.AfterSend && messageId != null && sentTimestamp != null) {
-            getDatabase(messageId.mms).markExpireStarted(messageId.id, sentTimestamp)
+        if (message.expiryMode is ExpiryMode.AfterSend && messageId != null) {
+            getDatabase(messageId.mms)
+                .markExpireStarted(messageId.id, clock.currentTimeMills())
         }
     }
 
-
     private suspend fun processDatabase(db: MessagingDatabase) {
         while (true) {
             val expiredMessages = db.getExpiredMessageIDs(clock.currentTimeMills())