Coerce disappear type to DaR for Calls and DataExtraction

libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt

@@ -56,7 +56,10 @@ abstract class Message {
         dataMessage.group = groupProto.build()
     }
 
-    fun SignalServiceProtos.Content.Builder.setExpirationConfigurationIfNeeded(threadId: Long?): SignalServiceProtos.Content.Builder {
+    fun SignalServiceProtos.Content.Builder.setExpirationConfigurationIfNeeded(
+        threadId: Long?,
+        coerceDisappearAfterSendToRead: Boolean = false
+    ): SignalServiceProtos.Content.Builder {
         val config = threadId?.let(MessagingModuleConfiguration.shared.storage::getExpirationConfiguration)
             ?: run {
                 expirationTimer = 0
@@ -64,12 +67,10 @@ abstract class Message {
             }
         expirationTimer = config.expiryMode.expirySeconds.toInt()
         lastDisappearingMessageChangeTimestamp = config.updatedTimestampMs
-        config.expiryMode.let { expiryMode ->
+        expirationType = when (config.expiryMode) {
-            expirationType = when (expiryMode) {
+            is ExpiryMode.AfterSend -> if (coerceDisappearAfterSendToRead) ExpirationType.DELETE_AFTER_READ else ExpirationType.DELETE_AFTER_SEND
-                is ExpiryMode.AfterSend -> ExpirationType.DELETE_AFTER_SEND
+            is ExpiryMode.AfterRead -> ExpirationType.DELETE_AFTER_READ
-                is ExpiryMode.AfterRead -> ExpirationType.DELETE_AFTER_READ
+            else -> ExpirationType.UNKNOWN
-                else -> ExpirationType.UNKNOWN
-            }
         }
         return this
     }

libsession/src/main/java/org/session/libsession/messaging/messages/control/CallMessage.kt

@@ -82,8 +82,7 @@ class CallMessage(): ControlMessage() {
             .setUuid(callId!!.toString())
 
         val content = SignalServiceProtos.Content.newBuilder()
-        content.setExpirationConfigurationIfNeeded(threadID)
+        content.setExpirationConfigurationIfNeeded(threadID, true)
-
         return content
             .setCallMessage(callMessage)
             .build()

libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt

@@ -64,7 +64,7 @@ class DataExtractionNotification() : ControlMessage() {
             }
             val contentProto = SignalServiceProtos.Content.newBuilder()
             contentProto.dataExtractionNotification = dataExtractionNotification.build()
-            contentProto.setExpirationConfigurationIfNeeded(threadID)
+            contentProto.setExpirationConfigurationIfNeeded(threadID, true)
             return contentProto.build()
         } catch (e: Exception) {
             Log.w(TAG, "Couldn't construct data extraction notification proto from: $this")