From a966fca55e35c236a811b034d7a03cb270b8f3bc Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Wed, 17 May 2023 16:22:23 +1000 Subject: [PATCH] add disappearing messages type legacy --- .../Database/Models/DisappearingMessageConfiguration.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift index 74f2af76b..b2dc073d7 100644 --- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift +++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift @@ -20,11 +20,13 @@ public struct DisappearingMessagesConfiguration: Codable, Identifiable, Equatabl } public enum DisappearingMessageType: Int, Codable, Hashable, DatabaseValueConvertible { + case legacy case disappearAfterRead case disappearAfterSend public var defaultDuration: TimeInterval { switch self { + case .legacy: return (12 * 60 * 60) case .disappearAfterRead: return (12 * 60 * 60) case .disappearAfterSend: return (24 * 60 * 60) } @@ -32,6 +34,7 @@ public struct DisappearingMessagesConfiguration: Codable, Identifiable, Equatabl init(protoType: SNProtoContent.SNProtoContentExpirationType) { switch protoType { + case .legacy: self = .legacy case .deleteAfterRead: self = .disappearAfterRead case .deleteAfterSend: self = .disappearAfterSend } @@ -39,6 +42,7 @@ public struct DisappearingMessagesConfiguration: Codable, Identifiable, Equatabl func toProto() -> SNProtoContent.SNProtoContentExpirationType { switch self { + case .legacy: return .legacy case .disappearAfterRead: return .deleteAfterRead case .disappearAfterSend: return .deleteAfterSend } @@ -211,7 +215,7 @@ extension DisappearingMessagesConfiguration { public static func validDurationsSeconds(_ type: DisappearingMessageType) -> [TimeInterval] { switch type { - case .disappearAfterRead: + case .legacy, .disappearAfterRead: return [ 60, // TODO: remove this, for test purpose only (5 * 60),