Start expiration at end of handling each message type treating call and extraction as DaR

app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt

@@ -37,7 +37,7 @@ class DisappearingMessages @Inject constructor(
             sentTimestamp = expiryChangeTimestampMs
         }
 
-        messageExpirationManager.setExpirationTimer(message)
+        messageExpirationManager.insertExpirationTimerMessage(message)
         MessageSender.send(message, address)
         ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(context)
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesViewModel.kt

@@ -19,9 +19,6 @@ import kotlinx.coroutines.launch
 import network.loki.messenger.BuildConfig
 import network.loki.messenger.libsession_util.util.ExpiryMode
 import org.session.libsession.messaging.messages.ExpirationConfiguration
-import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
-import org.session.libsession.messaging.sending_receiving.MessageSender
-import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.SSKEnvironment.MessageExpirationManagerProtocol
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.conversation.disappearingmessages.ui.ExpiryCallbacks
@@ -30,13 +27,13 @@ import org.thoughtcrime.securesms.conversation.disappearingmessages.ui.toUiState
 import org.thoughtcrime.securesms.database.GroupDatabase
 import org.thoughtcrime.securesms.database.Storage
 import org.thoughtcrime.securesms.database.ThreadDatabase
-import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 
 class DisappearingMessagesViewModel(
     private val threadId: Long,
     private val application: Application,
     private val textSecurePreferences: TextSecurePreferences,
     private val messageExpirationManager: MessageExpirationManagerProtocol,
+    private val disappearingMessages: DisappearingMessages,
     private val threadDb: ThreadDatabase,
     private val groupDb: GroupDatabase,
     private val storage: Storage,
@@ -90,20 +87,7 @@ class DisappearingMessagesViewModel(
             return@launch
         }
 
-        val expiryChangeTimestampMs = SnodeAPI.nowWithOffset
-        storage.setExpirationConfiguration(ExpirationConfiguration(threadId, mode, expiryChangeTimestampMs))
-
-        val message = ExpirationTimerUpdate().apply {
-            expiryMode = mode
-            sender = textSecurePreferences.getLocalNumber()
-            isSenderSelf = true
-            recipient = address.serialize()
-            sentTimestamp = expiryChangeTimestampMs
-        }
-        messageExpirationManager.setExpirationTimer(message)
-        MessageSender.send(message, address)
-
-        ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(application)
+        disappearingMessages.set(threadId, address, mode)
 
         _event.send(Event.SUCCESS)
     }
@@ -121,6 +105,7 @@ class DisappearingMessagesViewModel(
         private val application: Application,
         private val textSecurePreferences: TextSecurePreferences,
         private val messageExpirationManager: MessageExpirationManagerProtocol,
+        private val disappearingMessages: DisappearingMessages,
         private val threadDb: ThreadDatabase,
         private val groupDb: GroupDatabase,
         private val storage: Storage
@@ -131,6 +116,7 @@ class DisappearingMessagesViewModel(
             application,
             textSecurePreferences,
             messageExpirationManager,
+            disappearingMessages,
             threadDb,
             groupDb,
             storage,

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

@@ -253,6 +253,8 @@ public class SmsDatabase extends MessagingDatabase {
 
   @Override
   public void markExpireStarted(long id, long startedAtTimestamp) {
+    Log.d(TAG, "markExpireStarted() called with: id = [" + id + "], startedAtTimestamp = [" + startedAtTimestamp + "]");
+
     ContentValues contentValues = new ContentValues();
     contentValues.put(EXPIRE_STARTED, startedAtTimestamp);
 

app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.kt

@@ -56,10 +56,10 @@ class MarkReadReceiver : BroadcastReceiver() {
             context: Context,
             markedReadMessages: List<MarkedMessageInfo>
         ) {
-            if (markedReadMessages.isEmpty()) return
-
             Log.d(TAG, "process() called with: markedReadMessages = $markedReadMessages")
 
+            if (markedReadMessages.isEmpty()) return
+
             sendReadReceipts(context, markedReadMessages)
 
             markedReadMessages.forEach { scheduleDeletion(context, it.expirationInfo) }

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

@@ -8,7 +8,6 @@ import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
 import org.session.libsession.messaging.messages.signal.IncomingMediaMessage
 import org.session.libsession.messaging.messages.signal.OutgoingExpirationUpdateMessage
 import org.session.libsession.snode.SnodeAPI.nowWithOffset
-import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.fromSerialized
 import org.session.libsession.utilities.GroupUtil.doubleEncodeGroupID
 import org.session.libsession.utilities.GroupUtil.getDecodedGroupIDAsData
@@ -21,7 +20,6 @@ import org.session.libsignal.utilities.guava.Optional
 import org.thoughtcrime.securesms.database.MmsDatabase
 import org.thoughtcrime.securesms.database.MmsSmsDatabase
 import org.thoughtcrime.securesms.database.SmsDatabase
-import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent.Companion.get
 import org.thoughtcrime.securesms.mms.MmsException
 import java.io.IOException
@@ -149,15 +147,14 @@ class ExpiringMessageManager(context: Context) : MessageExpirationManagerProtoco
         }
     }
 
-    override fun setExpirationTimer(message: ExpirationTimerUpdate) {
+    override fun insertExpirationTimerMessage(message: ExpirationTimerUpdate) {
         val expiryMode: ExpiryMode = message.expiryMode
         Log.d(TAG, "setExpirationTimer() called with: message = $message, expiryMode = $expiryMode")
 
         val userPublicKey = getLocalNumber(context)
         val senderPublicKey = message.sender
         val sentTimestamp = if (message.sentTimestamp == null) 0 else message.sentTimestamp!!
-        val expireStartedAt =
-            if (expiryMode is AfterSend || message.isSenderSelf) sentTimestamp else 0
+        val expireStartedAt = if (expiryMode is AfterSend || message.isSenderSelf) sentTimestamp else 0
 
         // Notify the user
         if (senderPublicKey == null || userPublicKey == senderPublicKey) {
@@ -167,14 +164,13 @@ class ExpiringMessageManager(context: Context) : MessageExpirationManagerProtoco
             insertIncomingExpirationTimerMessage(message, expireStartedAt)
         }
 
-        if (expiryMode is AfterSend && expiryMode.expirySeconds > 0 && message.sentTimestamp != null && senderPublicKey != null) {
-            startAnyExpiration(message.sentTimestamp!!, senderPublicKey, expireStartedAt)
-        }
+        startAnyExpiration(message)
     }
 
     override fun startAnyExpiration(timestamp: Long, author: String, expireStartedAt: Long) {
         Log.d(TAG, "startAnyExpiration() called with: timestamp = $timestamp, author = $author, expireStartedAt = $expireStartedAt")
-        val messageRecord = mmsSmsDatabase.getMessageFor(timestamp, author) ?: return
+        val messageRecord = mmsSmsDatabase.getMessageFor(timestamp, author) ?: throw Exception("no message record!!!")
+        Log.d(TAG, "startAnyExpiration() $messageRecord")
         val mms = messageRecord.isMms()
         getDatabase(mms).markExpireStarted(messageRecord.getId(), expireStartedAt)
         scheduleDeletion(messageRecord.getId(), mms, expireStartedAt, messageRecord.expiresIn)