proto update

SessionMessagingKit/Protos/Generated/SNProto.swift

@@ -1579,6 +1579,9 @@ extension SNProtoDataMessageClosedGroupControlMessageKeyPairWrapper.SNProtoDataM
         builder.setMembers(members)
         builder.setAdmins(admins)
         builder.setWrappers(wrappers)
+        if hasExpireTimer {
+            builder.setExpireTimer(expireTimer)
+        }
         return builder
     }
 
@@ -1640,6 +1643,10 @@ extension SNProtoDataMessageClosedGroupControlMessageKeyPairWrapper.SNProtoDataM
             proto.wrappers = wrappedItems.map { $0.proto }
         }
 
+        @objc public func setExpireTimer(_ valueParam: UInt32) {
+            proto.expireTimer = valueParam
+        }
+
         @objc public func build() throws -> SNProtoDataMessageClosedGroupControlMessage {
             return try SNProtoDataMessageClosedGroupControlMessage.parseProto(proto)
         }
@@ -1685,6 +1692,13 @@ extension SNProtoDataMessageClosedGroupControlMessageKeyPairWrapper.SNProtoDataM
         return proto.admins
     }
 
+    @objc public var expireTimer: UInt32 {
+        return proto.expireTimer
+    }
+    @objc public var hasExpireTimer: Bool {
+        return proto.hasExpireTimer
+    }
+
     private init(proto: SessionProtos_DataMessage.ClosedGroupControlMessage,
                  type: SNProtoDataMessageClosedGroupControlMessageType,
                  encryptionKeyPair: SNProtoKeyPair?,

SessionMessagingKit/Protos/Generated/WebSocketResources.pb.swift

@@ -54,7 +54,7 @@ struct WebSocketProtos_WebSocketRequestMessage {
   mutating func clearPath() {self._path = nil}
 
   var body: Data {
-    get {return _body ?? Data()}
+    get {return _body ?? SwiftProtobuf.Internal.emptyData}
     set {_body = newValue}
   }
   /// Returns true if `body` has been explicitly set.
@@ -121,7 +121,7 @@ struct WebSocketProtos_WebSocketResponseMessage {
   var headers: [String] = []
 
   var body: Data {
-    get {return _body ?? Data()}
+    get {return _body ?? SwiftProtobuf.Internal.emptyData}
     set {_body = newValue}
   }
   /// Returns true if `body` has been explicitly set.
@@ -234,15 +234,12 @@ extension WebSocketProtos_WebSocketRequestMessage: SwiftProtobuf.Message, SwiftP
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularStringField(value: &self._verb) }()
-      case 2: try { try decoder.decodeSingularStringField(value: &self._path) }()
-      case 3: try { try decoder.decodeSingularBytesField(value: &self._body) }()
-      case 4: try { try decoder.decodeSingularUInt64Field(value: &self._requestID) }()
-      case 5: try { try decoder.decodeRepeatedStringField(value: &self.headers) }()
+      case 1: try decoder.decodeSingularStringField(value: &self._verb)
+      case 2: try decoder.decodeSingularStringField(value: &self._path)
+      case 3: try decoder.decodeSingularBytesField(value: &self._body)
+      case 4: try decoder.decodeSingularUInt64Field(value: &self._requestID)
+      case 5: try decoder.decodeRepeatedStringField(value: &self.headers)
       default: break
       }
     }
@@ -290,15 +287,12 @@ extension WebSocketProtos_WebSocketResponseMessage: SwiftProtobuf.Message, Swift
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularUInt64Field(value: &self._requestID) }()
-      case 2: try { try decoder.decodeSingularUInt32Field(value: &self._status) }()
-      case 3: try { try decoder.decodeSingularStringField(value: &self._message) }()
-      case 4: try { try decoder.decodeSingularBytesField(value: &self._body) }()
-      case 5: try { try decoder.decodeRepeatedStringField(value: &self.headers) }()
+      case 1: try decoder.decodeSingularUInt64Field(value: &self._requestID)
+      case 2: try decoder.decodeSingularUInt32Field(value: &self._status)
+      case 3: try decoder.decodeSingularStringField(value: &self._message)
+      case 4: try decoder.decodeSingularBytesField(value: &self._body)
+      case 5: try decoder.decodeRepeatedStringField(value: &self.headers)
       default: break
       }
     }
@@ -344,13 +338,10 @@ extension WebSocketProtos_WebSocketMessage: SwiftProtobuf.Message, SwiftProtobuf
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularEnumField(value: &self._type) }()
-      case 2: try { try decoder.decodeSingularMessageField(value: &self._request) }()
-      case 3: try { try decoder.decodeSingularMessageField(value: &self._response) }()
+      case 1: try decoder.decodeSingularEnumField(value: &self._type)
+      case 2: try decoder.decodeSingularMessageField(value: &self._request)
+      case 3: try decoder.decodeSingularMessageField(value: &self._response)
       default: break
       }
     }

SessionMessagingKit/Protos/SessionProtos.proto

@@ -111,7 +111,7 @@ message DataMessage {
   message ClosedGroupControlMessage {
 
     enum Type {
-      NEW                         = 1; // publicKey, name, encryptionKeyPair, members, admins
+      NEW                         = 1; // publicKey, name, encryptionKeyPair, members, admins, expireTimer
       ENCRYPTION_KEY_PAIR         = 3; // publicKey, wrappers
       NAME_CHANGE                 = 4; // name
       MEMBERS_ADDED               = 5; // members
@@ -135,6 +135,7 @@ message DataMessage {
     repeated bytes          members           = 5;
     repeated bytes          admins            = 6;
     repeated KeyPairWrapper wrappers          = 7;
+    optional uint32         expireTimer       = 8;
   }
 
   optional string                    body                      = 1;