From f19915fb75e496923da020d42ebdb79b31187622 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 10:50:19 -0500 Subject: [PATCH] Add 'is update' flag to 'sent message' transcript proto schema. --- SignalServiceKit/protobuf/SignalService.proto | 33 +-- .../src/Protos/Generated/SSKProto.swift | 273 +----------------- .../Protos/Generated/SignalService.pb.swift | 175 +---------- 3 files changed, 40 insertions(+), 441 deletions(-) diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto index 91cd701f2..4c5ccaadf 100644 --- a/SignalServiceKit/protobuf/SignalService.proto +++ b/SignalServiceKit/protobuf/SignalService.proto @@ -265,19 +265,7 @@ message SyncMessage { optional DataMessage message = 3; optional uint64 expirationStartTimestamp = 4; repeated UnidentifiedDeliveryStatus unidentifiedStatus = 5; - } - - message SentUpdate { - message UnidentifiedDeliveryStatus { - // @required - optional string destination = 1; - optional bool unidentified = 2; - } - // @required - optional bytes groupId = 1; - // @required - optional uint64 timestamp = 2; - repeated UnidentifiedDeliveryStatus unidentifiedStatus = 3; + optional bool isUpdate = 6 [default = false]; } message Contacts { @@ -323,16 +311,15 @@ message SyncMessage { optional bool linkPreviews = 4; } - optional Sent sent = 1; - optional SentUpdate sentUpdate = 10; - optional Contacts contacts = 2; - optional Groups groups = 3; - optional Request request = 4; - repeated Read read = 5; - optional Blocked blocked = 6; - optional Verified verified = 7; - optional Configuration configuration = 9; - optional bytes padding = 8; + optional Sent sent = 1; + optional Contacts contacts = 2; + optional Groups groups = 3; + optional Request request = 4; + repeated Read read = 5; + optional Blocked blocked = 6; + optional Verified verified = 7; + optional Configuration configuration = 9; + optional bytes padding = 8; } message AttachmentPointer { diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index 96a68f7bd..cd1cacd2f 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -3602,6 +3602,9 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS builder.setExpirationStartTimestamp(expirationStartTimestamp) } builder.setUnidentifiedStatus(unidentifiedStatus) + if hasIsUpdate { + builder.setIsUpdate(isUpdate) + } return builder } @@ -3637,6 +3640,10 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS proto.unidentifiedStatus = wrappedItems.map { $0.proto } } + @objc public func setIsUpdate(_ valueParam: Bool) { + proto.isUpdate = valueParam + } + @objc public func build() throws -> SSKProtoSyncMessageSent { return try SSKProtoSyncMessageSent.parseProto(proto) } @@ -3676,6 +3683,13 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS return proto.hasExpirationStartTimestamp } + @objc public var isUpdate: Bool { + return proto.isUpdate + } + @objc public var hasIsUpdate: Bool { + return proto.hasIsUpdate + } + private init(proto: SignalServiceProtos_SyncMessage.Sent, message: SSKProtoDataMessage?, unidentifiedStatus: [SSKProtoSyncMessageSentUnidentifiedDeliveryStatus]) { @@ -3734,248 +3748,6 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { #endif -// MARK: - SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - -@objc public class SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus: NSObject { - - // MARK: - SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder - - @objc public class func builder(destination: String) -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { - return SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder(destination: destination) - } - - // asBuilder() constructs a builder that reflects the proto's contents. - @objc public func asBuilder() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { - let builder = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder(destination: destination) - if hasUnidentified { - builder.setUnidentified(unidentified) - } - return builder - } - - @objc public class SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder: NSObject { - - private var proto = SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus() - - @objc fileprivate override init() {} - - @objc fileprivate init(destination: String) { - super.init() - - setDestination(destination) - } - - @objc public func setDestination(_ valueParam: String) { - proto.destination = valueParam - } - - @objc public func setUnidentified(_ valueParam: Bool) { - proto.unidentified = valueParam - } - - @objc public func build() throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { - return try SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.parseProto(proto) - } - - @objc public func buildSerializedData() throws -> Data { - return try SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.parseProto(proto).serializedData() - } - } - - fileprivate let proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus - - @objc public let destination: String - - @objc public var unidentified: Bool { - return proto.unidentified - } - @objc public var hasUnidentified: Bool { - return proto.hasUnidentified - } - - private init(proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus, - destination: String) { - self.proto = proto - self.destination = destination - } - - @objc - public func serializedData() throws -> Data { - return try self.proto.serializedData() - } - - @objc public class func parseData(_ serializedData: Data) throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { - let proto = try SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus(serializedData: serializedData) - return try parseProto(proto) - } - - fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { - guard proto.hasDestination else { - throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: destination") - } - let destination = proto.destination - - // MARK: - Begin Validation Logic for SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - - - // MARK: - End Validation Logic for SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - - - let result = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus(proto: proto, - destination: destination) - return result - } - - @objc public override var debugDescription: String { - return "\(proto)" - } -} - -#if DEBUG - -extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { - @objc public func serializedDataIgnoringErrors() -> Data? { - return try! self.serializedData() - } -} - -extension SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus? { - return try! self.build() - } -} - -#endif - -// MARK: - SSKProtoSyncMessageSentUpdate - -@objc public class SSKProtoSyncMessageSentUpdate: NSObject { - - // MARK: - SSKProtoSyncMessageSentUpdateBuilder - - @objc public class func builder(groupID: Data, timestamp: UInt64) -> SSKProtoSyncMessageSentUpdateBuilder { - return SSKProtoSyncMessageSentUpdateBuilder(groupID: groupID, timestamp: timestamp) - } - - // asBuilder() constructs a builder that reflects the proto's contents. - @objc public func asBuilder() -> SSKProtoSyncMessageSentUpdateBuilder { - let builder = SSKProtoSyncMessageSentUpdateBuilder(groupID: groupID, timestamp: timestamp) - builder.setUnidentifiedStatus(unidentifiedStatus) - return builder - } - - @objc public class SSKProtoSyncMessageSentUpdateBuilder: NSObject { - - private var proto = SignalServiceProtos_SyncMessage.SentUpdate() - - @objc fileprivate override init() {} - - @objc fileprivate init(groupID: Data, timestamp: UInt64) { - super.init() - - setGroupID(groupID) - setTimestamp(timestamp) - } - - @objc public func setGroupID(_ valueParam: Data) { - proto.groupID = valueParam - } - - @objc public func setTimestamp(_ valueParam: UInt64) { - proto.timestamp = valueParam - } - - @objc public func addUnidentifiedStatus(_ valueParam: SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus) { - var items = proto.unidentifiedStatus - items.append(valueParam.proto) - proto.unidentifiedStatus = items - } - - @objc public func setUnidentifiedStatus(_ wrappedItems: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus]) { - proto.unidentifiedStatus = wrappedItems.map { $0.proto } - } - - @objc public func build() throws -> SSKProtoSyncMessageSentUpdate { - return try SSKProtoSyncMessageSentUpdate.parseProto(proto) - } - - @objc public func buildSerializedData() throws -> Data { - return try SSKProtoSyncMessageSentUpdate.parseProto(proto).serializedData() - } - } - - fileprivate let proto: SignalServiceProtos_SyncMessage.SentUpdate - - @objc public let groupID: Data - - @objc public let timestamp: UInt64 - - @objc public let unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus] - - private init(proto: SignalServiceProtos_SyncMessage.SentUpdate, - groupID: Data, - timestamp: UInt64, - unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus]) { - self.proto = proto - self.groupID = groupID - self.timestamp = timestamp - self.unidentifiedStatus = unidentifiedStatus - } - - @objc - public func serializedData() throws -> Data { - return try self.proto.serializedData() - } - - @objc public class func parseData(_ serializedData: Data) throws -> SSKProtoSyncMessageSentUpdate { - let proto = try SignalServiceProtos_SyncMessage.SentUpdate(serializedData: serializedData) - return try parseProto(proto) - } - - fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.SentUpdate) throws -> SSKProtoSyncMessageSentUpdate { - guard proto.hasGroupID else { - throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: groupID") - } - let groupID = proto.groupID - - guard proto.hasTimestamp else { - throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: timestamp") - } - let timestamp = proto.timestamp - - var unidentifiedStatus: [SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus] = [] - unidentifiedStatus = try proto.unidentifiedStatus.map { try SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus.parseProto($0) } - - // MARK: - Begin Validation Logic for SSKProtoSyncMessageSentUpdate - - - // MARK: - End Validation Logic for SSKProtoSyncMessageSentUpdate - - - let result = SSKProtoSyncMessageSentUpdate(proto: proto, - groupID: groupID, - timestamp: timestamp, - unidentifiedStatus: unidentifiedStatus) - return result - } - - @objc public override var debugDescription: String { - return "\(proto)" - } -} - -#if DEBUG - -extension SSKProtoSyncMessageSentUpdate { - @objc public func serializedDataIgnoringErrors() -> Data? { - return try! self.serializedData() - } -} - -extension SSKProtoSyncMessageSentUpdate.SSKProtoSyncMessageSentUpdateBuilder { - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageSentUpdate? { - return try! self.build() - } -} - -#endif - // MARK: - SSKProtoSyncMessageContacts @objc public class SSKProtoSyncMessageContacts: NSObject { @@ -4676,9 +4448,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild if let _value = sent { builder.setSent(_value) } - if let _value = sentUpdate { - builder.setSentUpdate(_value) - } if let _value = contacts { builder.setContacts(_value) } @@ -4714,10 +4483,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild proto.sent = valueParam.proto } - @objc public func setSentUpdate(_ valueParam: SSKProtoSyncMessageSentUpdate) { - proto.sentUpdate = valueParam.proto - } - @objc public func setContacts(_ valueParam: SSKProtoSyncMessageContacts) { proto.contacts = valueParam.proto } @@ -4769,8 +4534,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild @objc public let sent: SSKProtoSyncMessageSent? - @objc public let sentUpdate: SSKProtoSyncMessageSentUpdate? - @objc public let contacts: SSKProtoSyncMessageContacts? @objc public let groups: SSKProtoSyncMessageGroups? @@ -4797,7 +4560,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild private init(proto: SignalServiceProtos_SyncMessage, sent: SSKProtoSyncMessageSent?, - sentUpdate: SSKProtoSyncMessageSentUpdate?, contacts: SSKProtoSyncMessageContacts?, groups: SSKProtoSyncMessageGroups?, request: SSKProtoSyncMessageRequest?, @@ -4807,7 +4569,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild configuration: SSKProtoSyncMessageConfiguration?) { self.proto = proto self.sent = sent - self.sentUpdate = sentUpdate self.contacts = contacts self.groups = groups self.request = request @@ -4833,11 +4594,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild sent = try SSKProtoSyncMessageSent.parseProto(proto.sent) } - var sentUpdate: SSKProtoSyncMessageSentUpdate? = nil - if proto.hasSentUpdate { - sentUpdate = try SSKProtoSyncMessageSentUpdate.parseProto(proto.sentUpdate) - } - var contacts: SSKProtoSyncMessageContacts? = nil if proto.hasContacts { contacts = try SSKProtoSyncMessageContacts.parseProto(proto.contacts) @@ -4877,7 +4633,6 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild let result = SSKProtoSyncMessage(proto: proto, sent: sent, - sentUpdate: sentUpdate, contacts: contacts, groups: groups, request: request, diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift index b40305e1c..ad5bb91b0 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift @@ -1452,15 +1452,6 @@ struct SignalServiceProtos_SyncMessage { /// Clears the value of `sent`. Subsequent reads from it will return its default value. mutating func clearSent() {_uniqueStorage()._sent = nil} - var sentUpdate: SignalServiceProtos_SyncMessage.SentUpdate { - get {return _storage._sentUpdate ?? SignalServiceProtos_SyncMessage.SentUpdate()} - set {_uniqueStorage()._sentUpdate = newValue} - } - /// Returns true if `sentUpdate` has been explicitly set. - var hasSentUpdate: Bool {return _storage._sentUpdate != nil} - /// Clears the value of `sentUpdate`. Subsequent reads from it will return its default value. - mutating func clearSentUpdate() {_uniqueStorage()._sentUpdate = nil} - var contacts: SignalServiceProtos_SyncMessage.Contacts { get {return _storage._contacts ?? SignalServiceProtos_SyncMessage.Contacts()} set {_uniqueStorage()._contacts = newValue} @@ -1577,70 +1568,14 @@ struct SignalServiceProtos_SyncMessage { set {_uniqueStorage()._unidentifiedStatus = newValue} } - var unknownFields = SwiftProtobuf.UnknownStorage() - - struct UnidentifiedDeliveryStatus { - // SwiftProtobuf.Message conformance is added in an extension below. See the - // `Message` and `Message+*Additions` files in the SwiftProtobuf library for - // methods supported on all messages. - - var destination: String { - get {return _destination ?? String()} - set {_destination = newValue} - } - /// Returns true if `destination` has been explicitly set. - var hasDestination: Bool {return self._destination != nil} - /// Clears the value of `destination`. Subsequent reads from it will return its default value. - mutating func clearDestination() {self._destination = nil} - - var unidentified: Bool { - get {return _unidentified ?? false} - set {_unidentified = newValue} - } - /// Returns true if `unidentified` has been explicitly set. - var hasUnidentified: Bool {return self._unidentified != nil} - /// Clears the value of `unidentified`. Subsequent reads from it will return its default value. - mutating func clearUnidentified() {self._unidentified = nil} - - var unknownFields = SwiftProtobuf.UnknownStorage() - - init() {} - - fileprivate var _destination: String? = nil - fileprivate var _unidentified: Bool? = nil - } - - init() {} - - fileprivate var _storage = _StorageClass.defaultInstance - } - - struct SentUpdate { - // SwiftProtobuf.Message conformance is added in an extension below. See the - // `Message` and `Message+*Additions` files in the SwiftProtobuf library for - // methods supported on all messages. - - /// @required - var groupID: Data { - get {return _groupID ?? SwiftProtobuf.Internal.emptyData} - set {_groupID = newValue} + var isUpdate: Bool { + get {return _storage._isUpdate ?? false} + set {_uniqueStorage()._isUpdate = newValue} } - /// Returns true if `groupID` has been explicitly set. - var hasGroupID: Bool {return self._groupID != nil} - /// Clears the value of `groupID`. Subsequent reads from it will return its default value. - mutating func clearGroupID() {self._groupID = nil} - - /// @required - var timestamp: UInt64 { - get {return _timestamp ?? 0} - set {_timestamp = newValue} - } - /// Returns true if `timestamp` has been explicitly set. - var hasTimestamp: Bool {return self._timestamp != nil} - /// Clears the value of `timestamp`. Subsequent reads from it will return its default value. - mutating func clearTimestamp() {self._timestamp = nil} - - var unidentifiedStatus: [SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus] = [] + /// Returns true if `isUpdate` has been explicitly set. + var hasIsUpdate: Bool {return _storage._isUpdate != nil} + /// Clears the value of `isUpdate`. Subsequent reads from it will return its default value. + mutating func clearIsUpdate() {_uniqueStorage()._isUpdate = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -1649,7 +1584,6 @@ struct SignalServiceProtos_SyncMessage { // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. - /// @required var destination: String { get {return _destination ?? String()} set {_destination = newValue} @@ -1678,8 +1612,7 @@ struct SignalServiceProtos_SyncMessage { init() {} - fileprivate var _groupID: Data? = nil - fileprivate var _timestamp: UInt64? = nil + fileprivate var _storage = _StorageClass.defaultInstance } struct Contacts { @@ -3791,7 +3724,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. static let protoMessageName: String = _protobuf_package + ".SyncMessage" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "sent"), - 10: .same(proto: "sentUpdate"), 2: .same(proto: "contacts"), 3: .same(proto: "groups"), 4: .same(proto: "request"), @@ -3804,7 +3736,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. fileprivate class _StorageClass { var _sent: SignalServiceProtos_SyncMessage.Sent? = nil - var _sentUpdate: SignalServiceProtos_SyncMessage.SentUpdate? = nil var _contacts: SignalServiceProtos_SyncMessage.Contacts? = nil var _groups: SignalServiceProtos_SyncMessage.Groups? = nil var _request: SignalServiceProtos_SyncMessage.Request? = nil @@ -3820,7 +3751,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. init(copying source: _StorageClass) { _sent = source._sent - _sentUpdate = source._sentUpdate _contacts = source._contacts _groups = source._groups _request = source._request @@ -3853,7 +3783,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. case 7: try decoder.decodeSingularMessageField(value: &_storage._verified) case 8: try decoder.decodeSingularBytesField(value: &_storage._padding) case 9: try decoder.decodeSingularMessageField(value: &_storage._configuration) - case 10: try decoder.decodeSingularMessageField(value: &_storage._sentUpdate) default: break } } @@ -3889,9 +3818,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. if let v = _storage._configuration { try visitor.visitSingularMessageField(value: v, fieldNumber: 9) } - if let v = _storage._sentUpdate { - try visitor.visitSingularMessageField(value: v, fieldNumber: 10) - } } try unknownFields.traverse(visitor: &visitor) } @@ -3902,7 +3828,6 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. let _storage = _args.0 let rhs_storage = _args.1 if _storage._sent != rhs_storage._sent {return false} - if _storage._sentUpdate != rhs_storage._sentUpdate {return false} if _storage._contacts != rhs_storage._contacts {return false} if _storage._groups != rhs_storage._groups {return false} if _storage._request != rhs_storage._request {return false} @@ -3928,6 +3853,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt 3: .same(proto: "message"), 4: .same(proto: "expirationStartTimestamp"), 5: .same(proto: "unidentifiedStatus"), + 6: .same(proto: "isUpdate"), ] fileprivate class _StorageClass { @@ -3936,6 +3862,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt var _message: SignalServiceProtos_DataMessage? = nil var _expirationStartTimestamp: UInt64? = nil var _unidentifiedStatus: [SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus] = [] + var _isUpdate: Bool? = nil static let defaultInstance = _StorageClass() @@ -3947,6 +3874,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt _message = source._message _expirationStartTimestamp = source._expirationStartTimestamp _unidentifiedStatus = source._unidentifiedStatus + _isUpdate = source._isUpdate } } @@ -3967,6 +3895,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt case 3: try decoder.decodeSingularMessageField(value: &_storage._message) case 4: try decoder.decodeSingularUInt64Field(value: &_storage._expirationStartTimestamp) case 5: try decoder.decodeRepeatedMessageField(value: &_storage._unidentifiedStatus) + case 6: try decoder.decodeSingularBoolField(value: &_storage._isUpdate) default: break } } @@ -3990,6 +3919,9 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt if !_storage._unidentifiedStatus.isEmpty { try visitor.visitRepeatedMessageField(value: _storage._unidentifiedStatus, fieldNumber: 5) } + if let v = _storage._isUpdate { + try visitor.visitSingularBoolField(value: v, fieldNumber: 6) + } } try unknownFields.traverse(visitor: &visitor) } @@ -4004,6 +3936,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt if _storage._message != rhs_storage._message {return false} if _storage._expirationStartTimestamp != rhs_storage._expirationStartTimestamp {return false} if _storage._unidentifiedStatus != rhs_storage._unidentifiedStatus {return false} + if _storage._isUpdate != rhs_storage._isUpdate {return false} return true } if !storagesAreEqual {return false} @@ -4048,82 +3981,6 @@ extension SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus: Swift } } -extension SignalServiceProtos_SyncMessage.SentUpdate: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { - static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".SentUpdate" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "groupId"), - 2: .same(proto: "timestamp"), - 3: .same(proto: "unidentifiedStatus"), - ] - - mutating func decodeMessage(decoder: inout D) throws { - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularBytesField(value: &self._groupID) - case 2: try decoder.decodeSingularUInt64Field(value: &self._timestamp) - case 3: try decoder.decodeRepeatedMessageField(value: &self.unidentifiedStatus) - default: break - } - } - } - - func traverse(visitor: inout V) throws { - if let v = self._groupID { - try visitor.visitSingularBytesField(value: v, fieldNumber: 1) - } - if let v = self._timestamp { - try visitor.visitSingularUInt64Field(value: v, fieldNumber: 2) - } - if !self.unidentifiedStatus.isEmpty { - try visitor.visitRepeatedMessageField(value: self.unidentifiedStatus, fieldNumber: 3) - } - try unknownFields.traverse(visitor: &visitor) - } - - static func ==(lhs: SignalServiceProtos_SyncMessage.SentUpdate, rhs: SignalServiceProtos_SyncMessage.SentUpdate) -> Bool { - if lhs._groupID != rhs._groupID {return false} - if lhs._timestamp != rhs._timestamp {return false} - if lhs.unidentifiedStatus != rhs.unidentifiedStatus {return false} - if lhs.unknownFields != rhs.unknownFields {return false} - return true - } -} - -extension SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { - static let protoMessageName: String = SignalServiceProtos_SyncMessage.SentUpdate.protoMessageName + ".UnidentifiedDeliveryStatus" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "destination"), - 2: .same(proto: "unidentified"), - ] - - mutating func decodeMessage(decoder: inout D) throws { - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularStringField(value: &self._destination) - case 2: try decoder.decodeSingularBoolField(value: &self._unidentified) - default: break - } - } - } - - func traverse(visitor: inout V) throws { - if let v = self._destination { - try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = self._unidentified { - try visitor.visitSingularBoolField(value: v, fieldNumber: 2) - } - try unknownFields.traverse(visitor: &visitor) - } - - static func ==(lhs: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus, rhs: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) -> Bool { - if lhs._destination != rhs._destination {return false} - if lhs._unidentified != rhs._unidentified {return false} - if lhs.unknownFields != rhs.unknownFields {return false} - return true - } -} - extension SignalServiceProtos_SyncMessage.Contacts: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".Contacts" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [