refactor and clean up on Expiration Timer Update messages

Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift

@@ -341,12 +341,9 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
                     serverExpirationTimestamp: nil
                 )
             
-            let expirationTimerUpdateMessage: ExpirationTimerUpdate = ExpirationTimerUpdate(
-                syncTarget: nil,
-                duration: nil
-            )
-            .with(sentTimestamp: UInt64(currentTimestampMs))
-            .with(updatedConfig)
+            let expirationTimerUpdateMessage: ExpirationTimerUpdate = ExpirationTimerUpdate()
+                .with(sentTimestamp: UInt64(currentTimestampMs))
+                .with(updatedConfig)
 
             try MessageSender.send(
                 db,

SessionMessagingKit/Messages/Message.swift

@@ -262,7 +262,6 @@ public extension Message {
     static func shouldSync(message: Message) -> Bool {
         switch message {
             case is VisibleMessage: return true
-            case is ExpirationTimerUpdate: return true
             case is UnsendRequest: return true
             
             case let controlMessage as ClosedGroupControlMessage:
@@ -289,7 +288,6 @@ public extension Message {
                 
                 switch message {
                     case let message as VisibleMessage: maybeSyncTarget = message.syncTarget
-                    case let message as ExpirationTimerUpdate: maybeSyncTarget = message.syncTarget
                     default: maybeSyncTarget = nil
                 }
                 

SessionMessagingKit/Open Groups/OpenGroupManager.swift

@@ -784,9 +784,6 @@ public final class OpenGroupManager {
                                 case .visibleMessage:
                                     (messageInfo.message as? VisibleMessage)?.syncTarget = syncTarget
                                     
-                                case .expirationTimerUpdate:
-                                    (messageInfo.message as? ExpirationTimerUpdate)?.syncTarget = syncTarget
-                                    
                                 default: break
                             }
                         }

SessionMessagingKit/Protos/Generated/SNProto.swift

@@ -2487,9 +2487,6 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr
         if hasFlags {
             builder.setFlags(flags)
         }
-        if hasExpireTimer {
-            builder.setExpireTimer(expireTimer)
-        }
         if let _value = profileKey {
             builder.setProfileKey(_value)
         }
@@ -2545,10 +2542,6 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr
             proto.flags = valueParam
         }
 
-        @objc public func setExpireTimer(_ valueParam: UInt32) {
-            proto.expireTimer = valueParam
-        }
-
         @objc public func setProfileKey(_ valueParam: Data) {
             proto.profileKey = valueParam
         }
@@ -2637,13 +2630,6 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr
         return proto.hasFlags
     }
 
-    @objc public var expireTimer: UInt32 {
-        return proto.expireTimer
-    }
-    @objc public var hasExpireTimer: Bool {
-        return proto.hasExpireTimer
-    }
-
     @objc public var profileKey: Data? {
         guard proto.hasProfileKey else {
             return nil

SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift

@@ -647,15 +647,7 @@ struct SessionProtos_DataMessage {
   /// Clears the value of `flags`. Subsequent reads from it will return its default value.
   mutating func clearFlags() {_uniqueStorage()._flags = nil}
 
-  var expireTimer: UInt32 {
-    get {return _storage._expireTimer ?? 0}
-    set {_uniqueStorage()._expireTimer = newValue}
-  }
-  /// Returns true if `expireTimer` has been explicitly set.
-  var hasExpireTimer: Bool {return _storage._expireTimer != nil}
-  /// Clears the value of `expireTimer`. Subsequent reads from it will return its default value.
-  mutating func clearExpireTimer() {_uniqueStorage()._expireTimer = nil}
-
+  /// optional uint32                 expireTimer                    = 5;  // No longer used
   var profileKey: Data {
     get {return _storage._profileKey ?? Data()}
     set {_uniqueStorage()._profileKey = newValue}
@@ -2091,7 +2083,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
     1: .same(proto: "body"),
     2: .same(proto: "attachments"),
     4: .same(proto: "flags"),
-    5: .same(proto: "expireTimer"),
     6: .same(proto: "profileKey"),
     7: .same(proto: "timestamp"),
     8: .same(proto: "quote"),
@@ -2108,7 +2099,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
     var _body: String? = nil
     var _attachments: [SessionProtos_AttachmentPointer] = []
     var _flags: UInt32? = nil
-    var _expireTimer: UInt32? = nil
     var _profileKey: Data? = nil
     var _timestamp: UInt64? = nil
     var _quote: SessionProtos_DataMessage.Quote? = nil
@@ -2128,7 +2118,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
       _body = source._body
       _attachments = source._attachments
       _flags = source._flags
-      _expireTimer = source._expireTimer
       _profileKey = source._profileKey
       _timestamp = source._timestamp
       _quote = source._quote
@@ -2172,7 +2161,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
         case 1: try { try decoder.decodeSingularStringField(value: &_storage._body) }()
         case 2: try { try decoder.decodeRepeatedMessageField(value: &_storage._attachments) }()
         case 4: try { try decoder.decodeSingularUInt32Field(value: &_storage._flags) }()
-        case 5: try { try decoder.decodeSingularUInt32Field(value: &_storage._expireTimer) }()
         case 6: try { try decoder.decodeSingularBytesField(value: &_storage._profileKey) }()
         case 7: try { try decoder.decodeSingularUInt64Field(value: &_storage._timestamp) }()
         case 8: try { try decoder.decodeSingularMessageField(value: &_storage._quote) }()
@@ -2204,9 +2192,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
       try { if let v = _storage._flags {
         try visitor.visitSingularUInt32Field(value: v, fieldNumber: 4)
       } }()
-      try { if let v = _storage._expireTimer {
-        try visitor.visitSingularUInt32Field(value: v, fieldNumber: 5)
-      } }()
       try { if let v = _storage._profileKey {
         try visitor.visitSingularBytesField(value: v, fieldNumber: 6)
       } }()
@@ -2249,7 +2234,6 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa
         if _storage._body != rhs_storage._body {return false}
         if _storage._attachments != rhs_storage._attachments {return false}
         if _storage._flags != rhs_storage._flags {return false}
-        if _storage._expireTimer != rhs_storage._expireTimer {return false}
         if _storage._profileKey != rhs_storage._profileKey {return false}
         if _storage._timestamp != rhs_storage._timestamp {return false}
         if _storage._quote != rhs_storage._quote {return false}

SessionMessagingKit/Protos/SessionProtos.proto

@@ -206,7 +206,7 @@ message DataMessage {
   repeated AttachmentPointer         attachments                    = 2;
   // optional GroupContext           group                          = 3;  // No longer used
   optional uint32                    flags                          = 4;
-  optional uint32                    expireTimer                    = 5;
+  // optional uint32                 expireTimer                    = 5;  // No longer used
   optional bytes                     profileKey                     = 6;
   optional uint64                    timestamp                      = 7;
   optional Quote                     quote                          = 8;

SessionMessagingKit/Sending & Receiving/MessageSender.swift

@@ -1144,7 +1144,6 @@ public final class MessageSender {
             Message.shouldSync(message: message)
         {
             if let message = message as? VisibleMessage { message.syncTarget = publicKey }
-            if let message = message as? ExpirationTimerUpdate { message.syncTarget = publicKey }
             
             dependencies.jobRunner.add(
                 db,