diff --git a/SessionMessagingKit/Protos/Generated/SNProto.swift b/SessionMessagingKit/Protos/Generated/SNProto.swift index e747c8490..ee0d660dd 100644 --- a/SessionMessagingKit/Protos/Generated/SNProto.swift +++ b/SessionMessagingKit/Protos/Generated/SNProto.swift @@ -942,9 +942,6 @@ extension SNProtoSyncedExpiries.SNProtoSyncedExpiriesBuilder { if let _value = dataMessage { builder.setDataMessage(_value) } - if let _value = syncedExpiries { - builder.setSyncedExpiries(_value) - } if let _value = callMessage { builder.setCallMessage(_value) } @@ -975,6 +972,9 @@ extension SNProtoSyncedExpiries.SNProtoSyncedExpiriesBuilder { if hasLastDisappearingMessageChangeTimestamp { builder.setLastDisappearingMessageChangeTimestamp(lastDisappearingMessageChangeTimestamp) } + if let _value = syncedExpiries { + builder.setSyncedExpiries(_value) + } return builder } @@ -988,10 +988,6 @@ extension SNProtoSyncedExpiries.SNProtoSyncedExpiriesBuilder { proto.dataMessage = valueParam.proto } - @objc public func setSyncedExpiries(_ valueParam: SNProtoSyncedExpiries) { - proto.syncedExpiries = valueParam.proto - } - @objc public func setCallMessage(_ valueParam: SNProtoCallMessage) { proto.callMessage = valueParam.proto } @@ -1032,6 +1028,10 @@ extension SNProtoSyncedExpiries.SNProtoSyncedExpiriesBuilder { proto.lastDisappearingMessageChangeTimestamp = valueParam } + @objc public func setSyncedExpiries(_ valueParam: SNProtoSyncedExpiries) { + proto.syncedExpiries = valueParam.proto + } + @objc public func build() throws -> SNProtoContent { return try SNProtoContent.parseProto(proto) } @@ -1045,8 +1045,6 @@ extension SNProtoSyncedExpiries.SNProtoSyncedExpiriesBuilder { @objc public let dataMessage: SNProtoDataMessage? - @objc public let syncedExpiries: SNProtoSyncedExpiries? - @objc public let callMessage: SNProtoCallMessage? @objc public let receiptMessage: SNProtoReceiptMessage? @@ -1061,6 +1059,8 @@ extension SNProtoSyncedExpiries.SNProtoSyncedExpiriesBuilder { @objc public let messageRequestResponse: SNProtoMessageRequestResponse? + @objc public let syncedExpiries: SNProtoSyncedExpiries? + @objc public var expirationType: SNProtoContentExpirationType { return SNProtoContent.SNProtoContentExpirationTypeWrap(proto.expirationType) } @@ -1084,17 +1084,16 @@ extension SNProtoSyncedExpiries.SNProtoSyncedExpiriesBuilder { private init(proto: SessionProtos_Content, dataMessage: SNProtoDataMessage?, - syncedExpiries: SNProtoSyncedExpiries?, callMessage: SNProtoCallMessage?, receiptMessage: SNProtoReceiptMessage?, typingMessage: SNProtoTypingMessage?, configurationMessage: SNProtoConfigurationMessage?, dataExtractionNotification: SNProtoDataExtractionNotification?, unsendRequest: SNProtoUnsendRequest?, - messageRequestResponse: SNProtoMessageRequestResponse?) { + messageRequestResponse: SNProtoMessageRequestResponse?, + syncedExpiries: SNProtoSyncedExpiries?) { self.proto = proto self.dataMessage = dataMessage - self.syncedExpiries = syncedExpiries self.callMessage = callMessage self.receiptMessage = receiptMessage self.typingMessage = typingMessage @@ -1102,6 +1101,7 @@ extension SNProtoSyncedExpiries.SNProtoSyncedExpiriesBuilder { self.dataExtractionNotification = dataExtractionNotification self.unsendRequest = unsendRequest self.messageRequestResponse = messageRequestResponse + self.syncedExpiries = syncedExpiries } @objc @@ -1120,11 +1120,6 @@ extension SNProtoSyncedExpiries.SNProtoSyncedExpiriesBuilder { dataMessage = try SNProtoDataMessage.parseProto(proto.dataMessage) } - var syncedExpiries: SNProtoSyncedExpiries? = nil - if proto.hasSyncedExpiries { - syncedExpiries = try SNProtoSyncedExpiries.parseProto(proto.syncedExpiries) - } - var callMessage: SNProtoCallMessage? = nil if proto.hasCallMessage { callMessage = try SNProtoCallMessage.parseProto(proto.callMessage) @@ -1160,20 +1155,25 @@ extension SNProtoSyncedExpiries.SNProtoSyncedExpiriesBuilder { messageRequestResponse = try SNProtoMessageRequestResponse.parseProto(proto.messageRequestResponse) } + var syncedExpiries: SNProtoSyncedExpiries? = nil + if proto.hasSyncedExpiries { + syncedExpiries = try SNProtoSyncedExpiries.parseProto(proto.syncedExpiries) + } + // MARK: - Begin Validation Logic for SNProtoContent - // MARK: - End Validation Logic for SNProtoContent - let result = SNProtoContent(proto: proto, dataMessage: dataMessage, - syncedExpiries: syncedExpiries, callMessage: callMessage, receiptMessage: receiptMessage, typingMessage: typingMessage, configurationMessage: configurationMessage, dataExtractionNotification: dataExtractionNotification, unsendRequest: unsendRequest, - messageRequestResponse: messageRequestResponse) + messageRequestResponse: messageRequestResponse, + syncedExpiries: syncedExpiries) return result } diff --git a/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift b/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift index 9f90f8db9..aad58d4de 100644 --- a/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift +++ b/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift @@ -354,15 +354,6 @@ struct SessionProtos_Content { /// Clears the value of `dataMessage`. Subsequent reads from it will return its default value. mutating func clearDataMessage() {_uniqueStorage()._dataMessage = nil} - var syncedExpiries: SessionProtos_SyncedExpiries { - get {return _storage._syncedExpiries ?? SessionProtos_SyncedExpiries()} - set {_uniqueStorage()._syncedExpiries = newValue} - } - /// Returns true if `syncedExpiries` has been explicitly set. - var hasSyncedExpiries: Bool {return _storage._syncedExpiries != nil} - /// Clears the value of `syncedExpiries`. Subsequent reads from it will return its default value. - mutating func clearSyncedExpiries() {_uniqueStorage()._syncedExpiries = nil} - var callMessage: SessionProtos_CallMessage { get {return _storage._callMessage ?? SessionProtos_CallMessage()} set {_uniqueStorage()._callMessage = newValue} @@ -453,6 +444,15 @@ struct SessionProtos_Content { /// Clears the value of `lastDisappearingMessageChangeTimestamp`. Subsequent reads from it will return its default value. mutating func clearLastDisappearingMessageChangeTimestamp() {_uniqueStorage()._lastDisappearingMessageChangeTimestamp = nil} + var syncedExpiries: SessionProtos_SyncedExpiries { + get {return _storage._syncedExpiries ?? SessionProtos_SyncedExpiries()} + set {_uniqueStorage()._syncedExpiries = newValue} + } + /// Returns true if `syncedExpiries` has been explicitly set. + var hasSyncedExpiries: Bool {return _storage._syncedExpiries != nil} + /// Clears the value of `syncedExpiries`. Subsequent reads from it will return its default value. + mutating func clearSyncedExpiries() {_uniqueStorage()._syncedExpiries = nil} + var unknownFields = SwiftProtobuf.UnknownStorage() enum ExpirationType: SwiftProtobuf.Enum { @@ -2174,7 +2174,6 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm static let protoMessageName: String = _protobuf_package + ".Content" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "dataMessage"), - 2: .same(proto: "syncedExpiries"), 3: .same(proto: "callMessage"), 5: .same(proto: "receiptMessage"), 6: .same(proto: "typingMessage"), @@ -2185,11 +2184,11 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm 11: .same(proto: "expirationType"), 12: .same(proto: "expirationTimer"), 13: .same(proto: "lastDisappearingMessageChangeTimestamp"), + 14: .same(proto: "syncedExpiries"), ] fileprivate class _StorageClass { var _dataMessage: SessionProtos_DataMessage? = nil - var _syncedExpiries: SessionProtos_SyncedExpiries? = nil var _callMessage: SessionProtos_CallMessage? = nil var _receiptMessage: SessionProtos_ReceiptMessage? = nil var _typingMessage: SessionProtos_TypingMessage? = nil @@ -2200,6 +2199,7 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm var _expirationType: SessionProtos_Content.ExpirationType? = nil var _expirationTimer: UInt32? = nil var _lastDisappearingMessageChangeTimestamp: UInt64? = nil + var _syncedExpiries: SessionProtos_SyncedExpiries? = nil static let defaultInstance = _StorageClass() @@ -2207,7 +2207,6 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm init(copying source: _StorageClass) { _dataMessage = source._dataMessage - _syncedExpiries = source._syncedExpiries _callMessage = source._callMessage _receiptMessage = source._receiptMessage _typingMessage = source._typingMessage @@ -2218,6 +2217,7 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm _expirationType = source._expirationType _expirationTimer = source._expirationTimer _lastDisappearingMessageChangeTimestamp = source._lastDisappearingMessageChangeTimestamp + _syncedExpiries = source._syncedExpiries } } @@ -2231,7 +2231,6 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm public var isInitialized: Bool { return withExtendedLifetime(_storage) { (_storage: _StorageClass) in if let v = _storage._dataMessage, !v.isInitialized {return false} - if let v = _storage._syncedExpiries, !v.isInitialized {return false} if let v = _storage._callMessage, !v.isInitialized {return false} if let v = _storage._receiptMessage, !v.isInitialized {return false} if let v = _storage._typingMessage, !v.isInitialized {return false} @@ -2239,6 +2238,7 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm if let v = _storage._dataExtractionNotification, !v.isInitialized {return false} if let v = _storage._unsendRequest, !v.isInitialized {return false} if let v = _storage._messageRequestResponse, !v.isInitialized {return false} + if let v = _storage._syncedExpiries, !v.isInitialized {return false} return true } } @@ -2252,7 +2252,6 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm // enabled. https://github.com/apple/swift-protobuf/issues/1034 switch fieldNumber { case 1: try { try decoder.decodeSingularMessageField(value: &_storage._dataMessage) }() - case 2: try { try decoder.decodeSingularMessageField(value: &_storage._syncedExpiries) }() case 3: try { try decoder.decodeSingularMessageField(value: &_storage._callMessage) }() case 5: try { try decoder.decodeSingularMessageField(value: &_storage._receiptMessage) }() case 6: try { try decoder.decodeSingularMessageField(value: &_storage._typingMessage) }() @@ -2263,6 +2262,7 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm case 11: try { try decoder.decodeSingularEnumField(value: &_storage._expirationType) }() case 12: try { try decoder.decodeSingularUInt32Field(value: &_storage._expirationTimer) }() case 13: try { try decoder.decodeSingularUInt64Field(value: &_storage._lastDisappearingMessageChangeTimestamp) }() + case 14: try { try decoder.decodeSingularMessageField(value: &_storage._syncedExpiries) }() default: break } } @@ -2274,9 +2274,6 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm if let v = _storage._dataMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 1) } - if let v = _storage._syncedExpiries { - try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - } if let v = _storage._callMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 3) } @@ -2307,6 +2304,9 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm if let v = _storage._lastDisappearingMessageChangeTimestamp { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 13) } + if let v = _storage._syncedExpiries { + try visitor.visitSingularMessageField(value: v, fieldNumber: 14) + } } try unknownFields.traverse(visitor: &visitor) } @@ -2317,7 +2317,6 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm let _storage = _args.0 let rhs_storage = _args.1 if _storage._dataMessage != rhs_storage._dataMessage {return false} - if _storage._syncedExpiries != rhs_storage._syncedExpiries {return false} if _storage._callMessage != rhs_storage._callMessage {return false} if _storage._receiptMessage != rhs_storage._receiptMessage {return false} if _storage._typingMessage != rhs_storage._typingMessage {return false} @@ -2328,6 +2327,7 @@ extension SessionProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._MessageIm if _storage._expirationType != rhs_storage._expirationType {return false} if _storage._expirationTimer != rhs_storage._expirationTimer {return false} if _storage._lastDisappearingMessageChangeTimestamp != rhs_storage._lastDisappearingMessageChangeTimestamp {return false} + if _storage._syncedExpiries != rhs_storage._syncedExpiries {return false} return true } if !storagesAreEqual {return false} diff --git a/SessionMessagingKit/Protos/SessionProtos.proto b/SessionMessagingKit/Protos/SessionProtos.proto index a1b80a58b..3bb2cece8 100644 --- a/SessionMessagingKit/Protos/SessionProtos.proto +++ b/SessionMessagingKit/Protos/SessionProtos.proto @@ -74,7 +74,6 @@ message Content { } optional DataMessage dataMessage = 1; - optional SyncedExpiries syncedExpiries = 2; optional CallMessage callMessage = 3; optional ReceiptMessage receiptMessage = 5; optional TypingMessage typingMessage = 6; @@ -85,6 +84,7 @@ message Content { optional ExpirationType expirationType = 11; optional uint32 expirationTimer = 12; optional uint64 lastDisappearingMessageChangeTimestamp = 13; + optional SyncedExpiries syncedExpiries = 14; } message CallMessage {