Revert the changes to disappearing deleted messages (#1331)

Author: SessionHero01

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

@@ -368,10 +368,6 @@ class MmsDatabase
         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,9 +246,6 @@ 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)});