From ea44a16f9dfc5d8b558cd8a27c4a29571d5d901c Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Wed, 7 Dec 2022 14:38:09 +1100
Subject: [PATCH] fix expire timer update message

---
 .../Settings/ThreadDisappearingMessagesViewModel.swift    | 7 ++++++-
 .../Models/DisappearingMessageConfiguration.swift         | 3 ++-
 .../Messages/Control Messages/ExpirationTimerUpdate.swift | 8 ++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
index c6a3b677e..afff5156e 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
@@ -449,12 +449,17 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
                 timestampMs: Int64(floor(Date().timeIntervalSince1970 * 1000))
             )
             .inserted(db)
+            
+            let duration: UInt32? = {
+                guard !DisappearingMessagesConfiguration.isNewConfigurationEnabled else { return nil }
+                return UInt32(floor(updatedConfig.isEnabled ? updatedConfig.durationSeconds : 0))
+            }()
 
             try MessageSender.send(
                 db,
                 message: ExpirationTimerUpdate(
                     syncTarget: nil,
-                    duration: UInt32(floor(updatedConfig.isEnabled ? updatedConfig.durationSeconds : 0))
+                    duration: duration
                 ),
                 interactionId: interaction.id,
                 in: thread
diff --git a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
index c17b04c89..2cd6fa9ab 100644
--- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
+++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
@@ -5,7 +5,8 @@ import GRDB
 import SessionUtilitiesKit
 
 public struct DisappearingMessagesConfiguration: Codable, Identifiable, Equatable, Hashable, FetchableRecord, PersistableRecord, TableRecord, ColumnExpressible {
-    public static let isNewConfigurationEnabled: Bool = Date().timeIntervalSince1970 > 1671062400 // 15/12/2022
+//    public static let isNewConfigurationEnabled: Bool = Date().timeIntervalSince1970 > 1671062400 // 15/12/2022
+    public static let isNewConfigurationEnabled: Bool = true
     
     public static var databaseTableName: String { "disappearingMessagesConfiguration" }
     internal static let threadForeignKey = ForeignKey([Columns.threadId], to: [SessionThread.Columns.id])
diff --git a/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift b/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift
index 196d51276..c8a8b0d35 100644
--- a/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift	
@@ -31,7 +31,7 @@ public final class ExpirationTimerUpdate: ControlMessage {
     
     public override var isValid: Bool {
         guard super.isValid else { return false }
-        return duration != nil
+        return duration != nil || DisappearingMessagesConfiguration.isNewConfigurationEnabled
     }
     
     // MARK: - Codable
@@ -69,13 +69,9 @@ public final class ExpirationTimerUpdate: ControlMessage {
     }
 
     public override func toProto(_ db: Database) -> SNProtoContent? {
-        guard let duration = duration else {
-            SNLog("Couldn't construct expiration timer update proto from: \(self).")
-            return nil
-        }
         let dataMessageProto = SNProtoDataMessage.builder()
         dataMessageProto.setFlags(UInt32(SNProtoDataMessage.SNProtoDataMessageFlags.expirationTimerUpdate.rawValue))
-        dataMessageProto.setExpireTimer(duration)
+        if let duration = duration { dataMessageProto.setExpireTimer(duration) }
         if let syncTarget = syncTarget { dataMessageProto.setSyncTarget(syncTarget) }
         // Group context
         do {