Default expiration timer value to zero

libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt

@@ -200,7 +200,7 @@ interface StorageProtocol {
     fun unblock(toUnblock: List<Recipient>)
     fun blockedContacts(): List<Recipient>
     fun getExpirationConfiguration(threadId: Long): ExpirationConfiguration?
-    fun addExpirationConfiguration(config: ExpirationConfiguration)
+    fun setExpirationConfiguration(config: ExpirationConfiguration)
     fun getExpiringMessages(messageIds: LongArray): List<Pair<String, Int>>
     fun updateDisappearingState(address: String, disappearingState: Recipient.DisappearingState)
 }

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

@@ -40,8 +40,11 @@ abstract class Message {
     }
 
     fun setExpirationConfigurationIfNeeded(builder: SignalServiceProtos.Content.Builder) {
-        val threadId = threadID ?: return
-        val config = MessagingModuleConfiguration.shared.storage.getExpirationConfiguration(threadId) ?: return
+        val config = threadID?.let { MessagingModuleConfiguration.shared.storage.getExpirationConfiguration(it) }
+            ?: run {
+                builder.expirationTimer = 0
+                return
+            }
         builder.expirationTimer = config.durationSeconds
         if (config.isEnabled) {
             builder.expirationType = config.expirationType

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt

@@ -101,7 +101,7 @@ fun updateExpirationConfigurationIfNeeded(message: Message, proto: SignalService
         type,
         proto.lastDisappearingMessageChangeTimestamp
     )
-    storage.addExpirationConfiguration(remoteConfig)
+    storage.setExpirationConfiguration(remoteConfig)
 }
 
 // region Control Messages