From 74ae71002da74eaed5db613e110eb24b3da4d106 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 30 Mar 2020 14:47:35 -0300 Subject: [PATCH] Add expiration to attachment pointer protos. --- SignalServiceKit/protobuf/SignalService.proto | 25 +- .../src/Protos/Generated/Fingerprint.pb.swift | 100 +- .../src/Protos/Generated/Groups.pb.swift | 749 ++--- .../src/Protos/Generated/KeyBackup.pb.swift | 198 +- .../Protos/Generated/Provisioning.pb.swift | 2 +- .../src/Protos/Generated/SSKProto.swift | 17 + .../src/Protos/Generated/SignalIOS.pb.swift | 10 +- .../Protos/Generated/SignalService.pb.swift | 2698 +++++++---------- .../Protos/Generated/StorageService.pb.swift | 269 +- .../Generated/WebSocketResources.pb.swift | 100 +- 10 files changed, 1548 insertions(+), 2620 deletions(-) diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto index f7070afd5e..4bd59d11c7 100644 --- a/SignalServiceKit/protobuf/SignalService.proto +++ b/SignalServiceKit/protobuf/SignalService.proto @@ -420,18 +420,19 @@ message AttachmentPointer { } // @required - optional fixed64 id = 1; - optional string contentType = 2; - optional bytes key = 3; - optional uint32 size = 4; - optional bytes thumbnail = 5; - optional bytes digest = 6; - optional string fileName = 7; - optional uint32 flags = 8; - optional uint32 width = 9; - optional uint32 height = 10; - optional string caption = 11; - optional string blurHash = 12; + optional fixed64 id = 1; + optional string contentType = 2; + optional bytes key = 3; + optional uint32 size = 4; + optional bytes thumbnail = 5; + optional bytes digest = 6; + optional string fileName = 7; + optional uint32 flags = 8; + optional uint32 width = 9; + optional uint32 height = 10; + optional string caption = 11; + optional string blurHash = 12; + optional uint64 uploadTimestamp = 13; } message GroupContext { diff --git a/SignalServiceKit/src/Protos/Generated/Fingerprint.pb.swift b/SignalServiceKit/src/Protos/Generated/Fingerprint.pb.swift index c2424f9a9f..04ed132bda 100644 --- a/SignalServiceKit/src/Protos/Generated/Fingerprint.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/Fingerprint.pb.swift @@ -11,7 +11,7 @@ import SwiftProtobuf // If the compiler emits an error on this type, it is because this file // was generated by a version of the `protoc` Swift plug-in that is // incompatible with the version of SwiftProtobuf to which you are linking. -// Please ensure that your are building against the same version of the API +// Please ensure that you are building against the same version of the API // that was used to generate this file. private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} @@ -47,39 +47,41 @@ struct FingerprintProtos_LogicalFingerprints { /// @required var version: UInt32 { - get {return _storage._version ?? 0} - set {_uniqueStorage()._version = newValue} + get {return _version ?? 0} + set {_version = newValue} } /// Returns true if `version` has been explicitly set. - var hasVersion: Bool {return _storage._version != nil} + var hasVersion: Bool {return self._version != nil} /// Clears the value of `version`. Subsequent reads from it will return its default value. - mutating func clearVersion() {_uniqueStorage()._version = nil} + mutating func clearVersion() {self._version = nil} /// @required var localFingerprint: FingerprintProtos_LogicalFingerprint { - get {return _storage._localFingerprint ?? FingerprintProtos_LogicalFingerprint()} - set {_uniqueStorage()._localFingerprint = newValue} + get {return _localFingerprint ?? FingerprintProtos_LogicalFingerprint()} + set {_localFingerprint = newValue} } /// Returns true if `localFingerprint` has been explicitly set. - var hasLocalFingerprint: Bool {return _storage._localFingerprint != nil} + var hasLocalFingerprint: Bool {return self._localFingerprint != nil} /// Clears the value of `localFingerprint`. Subsequent reads from it will return its default value. - mutating func clearLocalFingerprint() {_uniqueStorage()._localFingerprint = nil} + mutating func clearLocalFingerprint() {self._localFingerprint = nil} /// @required var remoteFingerprint: FingerprintProtos_LogicalFingerprint { - get {return _storage._remoteFingerprint ?? FingerprintProtos_LogicalFingerprint()} - set {_uniqueStorage()._remoteFingerprint = newValue} + get {return _remoteFingerprint ?? FingerprintProtos_LogicalFingerprint()} + set {_remoteFingerprint = newValue} } /// Returns true if `remoteFingerprint` has been explicitly set. - var hasRemoteFingerprint: Bool {return _storage._remoteFingerprint != nil} + var hasRemoteFingerprint: Bool {return self._remoteFingerprint != nil} /// Clears the value of `remoteFingerprint`. Subsequent reads from it will return its default value. - mutating func clearRemoteFingerprint() {_uniqueStorage()._remoteFingerprint = nil} + mutating func clearRemoteFingerprint() {self._remoteFingerprint = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _version: UInt32? + fileprivate var _localFingerprint: FingerprintProtos_LogicalFingerprint? + fileprivate var _remoteFingerprint: FingerprintProtos_LogicalFingerprint? } // MARK: - Code below here is support for the SwiftProtobuf runtime. @@ -123,70 +125,34 @@ extension FingerprintProtos_LogicalFingerprints: SwiftProtobuf.Message, SwiftPro 3: .same(proto: "remoteFingerprint") ] - fileprivate class _StorageClass { - var _version: UInt32? - var _localFingerprint: FingerprintProtos_LogicalFingerprint? - var _remoteFingerprint: FingerprintProtos_LogicalFingerprint? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _version = source._version - _localFingerprint = source._localFingerprint - _remoteFingerprint = source._remoteFingerprint - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularUInt32Field(value: &_storage._version) - case 2: try decoder.decodeSingularMessageField(value: &_storage._localFingerprint) - case 3: try decoder.decodeSingularMessageField(value: &_storage._remoteFingerprint) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularUInt32Field(value: &self._version) + case 2: try decoder.decodeSingularMessageField(value: &self._localFingerprint) + case 3: try decoder.decodeSingularMessageField(value: &self._remoteFingerprint) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._version { - try visitor.visitSingularUInt32Field(value: v, fieldNumber: 1) - } - if let v = _storage._localFingerprint { - try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - } - if let v = _storage._remoteFingerprint { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } + if let v = self._version { + try visitor.visitSingularUInt32Field(value: v, fieldNumber: 1) + } + if let v = self._localFingerprint { + try visitor.visitSingularMessageField(value: v, fieldNumber: 2) + } + if let v = self._remoteFingerprint { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: FingerprintProtos_LogicalFingerprints, rhs: FingerprintProtos_LogicalFingerprints) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._version != rhs_storage._version {return false} - if _storage._localFingerprint != rhs_storage._localFingerprint {return false} - if _storage._remoteFingerprint != rhs_storage._remoteFingerprint {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._version != rhs._version {return false} + if lhs._localFingerprint != rhs._localFingerprint {return false} + if lhs._remoteFingerprint != rhs._remoteFingerprint {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } diff --git a/SignalServiceKit/src/Protos/Generated/Groups.pb.swift b/SignalServiceKit/src/Protos/Generated/Groups.pb.swift index 063295922b..ee25464a85 100644 --- a/SignalServiceKit/src/Protos/Generated/Groups.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/Groups.pb.swift @@ -13,7 +13,7 @@ import SwiftProtobuf // If the compiler emits an error on this type, it is because this file // was generated by a version of the `protoc` Swift plug-in that is // incompatible with the version of SwiftProtobuf to which you are linking. -// Please ensure that your are building against the same version of the API +// Please ensure that you are building against the same version of the API // that was used to generate this file. private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} @@ -123,31 +123,25 @@ struct GroupsProtos_PendingMember { /// The “invited” member var member: GroupsProtos_Member { - get {return _storage._member ?? GroupsProtos_Member()} - set {_uniqueStorage()._member = newValue} + get {return _member ?? GroupsProtos_Member()} + set {_member = newValue} } /// Returns true if `member` has been explicitly set. - var hasMember: Bool {return _storage._member != nil} + var hasMember: Bool {return self._member != nil} /// Clears the value of `member`. Subsequent reads from it will return its default value. - mutating func clearMember() {_uniqueStorage()._member = nil} + mutating func clearMember() {self._member = nil} /// The UID who invited this member - var addedByUserID: Data { - get {return _storage._addedByUserID} - set {_uniqueStorage()._addedByUserID = newValue} - } + var addedByUserID: Data = SwiftProtobuf.Internal.emptyData /// The time the invitation occurred - var timestamp: UInt64 { - get {return _storage._timestamp} - set {_uniqueStorage()._timestamp = newValue} - } + var timestamp: UInt64 = 0 var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _member: GroupsProtos_Member? } struct GroupsProtos_AccessControl { @@ -226,59 +220,38 @@ struct GroupsProtos_Group { // methods supported on all messages. /// GroupPublicParams - var publicKey: Data { - get {return _storage._publicKey} - set {_uniqueStorage()._publicKey = newValue} - } + var publicKey: Data = SwiftProtobuf.Internal.emptyData /// Encrypted title - var title: Data { - get {return _storage._title} - set {_uniqueStorage()._title = newValue} - } + var title: Data = SwiftProtobuf.Internal.emptyData /// Pointer to encrypted avatar (‘key’ from AvatarUploadAttributes) - var avatar: String { - get {return _storage._avatar} - set {_uniqueStorage()._avatar = newValue} - } + var avatar: String = String() /// Encrypted timer - var disappearingMessagesTimer: Data { - get {return _storage._disappearingMessagesTimer} - set {_uniqueStorage()._disappearingMessagesTimer = newValue} - } + var disappearingMessagesTimer: Data = SwiftProtobuf.Internal.emptyData var accessControl: GroupsProtos_AccessControl { - get {return _storage._accessControl ?? GroupsProtos_AccessControl()} - set {_uniqueStorage()._accessControl = newValue} + get {return _accessControl ?? GroupsProtos_AccessControl()} + set {_accessControl = newValue} } /// Returns true if `accessControl` has been explicitly set. - var hasAccessControl: Bool {return _storage._accessControl != nil} + var hasAccessControl: Bool {return self._accessControl != nil} /// Clears the value of `accessControl`. Subsequent reads from it will return its default value. - mutating func clearAccessControl() {_uniqueStorage()._accessControl = nil} + mutating func clearAccessControl() {self._accessControl = nil} /// Current group version number - var version: UInt32 { - get {return _storage._version} - set {_uniqueStorage()._version = newValue} - } + var version: UInt32 = 0 - var members: [GroupsProtos_Member] { - get {return _storage._members} - set {_uniqueStorage()._members = newValue} - } + var members: [GroupsProtos_Member] = [] - var pendingMembers: [GroupsProtos_PendingMember] { - get {return _storage._pendingMembers} - set {_uniqueStorage()._pendingMembers = newValue} - } + var pendingMembers: [GroupsProtos_PendingMember] = [] var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _accessControl: GroupsProtos_AccessControl? } struct GroupsProtos_GroupChange { @@ -300,108 +273,81 @@ struct GroupsProtos_GroupChange { // methods supported on all messages. /// Who made the change - var sourceUuid: Data { - get {return _storage._sourceUuid} - set {_uniqueStorage()._sourceUuid = newValue} - } + var sourceUuid: Data = SwiftProtobuf.Internal.emptyData /// The change version number - var version: UInt32 { - get {return _storage._version} - set {_uniqueStorage()._version = newValue} - } + var version: UInt32 = 0 /// Members added - var addMembers: [GroupsProtos_GroupChange.Actions.AddMemberAction] { - get {return _storage._addMembers} - set {_uniqueStorage()._addMembers = newValue} - } + var addMembers: [GroupsProtos_GroupChange.Actions.AddMemberAction] = [] /// Members deleted - var deleteMembers: [GroupsProtos_GroupChange.Actions.DeleteMemberAction] { - get {return _storage._deleteMembers} - set {_uniqueStorage()._deleteMembers = newValue} - } + var deleteMembers: [GroupsProtos_GroupChange.Actions.DeleteMemberAction] = [] /// Modified member roles - var modifyMemberRoles: [GroupsProtos_GroupChange.Actions.ModifyMemberRoleAction] { - get {return _storage._modifyMemberRoles} - set {_uniqueStorage()._modifyMemberRoles = newValue} - } + var modifyMemberRoles: [GroupsProtos_GroupChange.Actions.ModifyMemberRoleAction] = [] /// Modified member profile keys - var modifyMemberProfileKeys: [GroupsProtos_GroupChange.Actions.ModifyMemberProfileKeyAction] { - get {return _storage._modifyMemberProfileKeys} - set {_uniqueStorage()._modifyMemberProfileKeys = newValue} - } + var modifyMemberProfileKeys: [GroupsProtos_GroupChange.Actions.ModifyMemberProfileKeyAction] = [] /// Pending members added - var addPendingMembers: [GroupsProtos_GroupChange.Actions.AddPendingMemberAction] { - get {return _storage._addPendingMembers} - set {_uniqueStorage()._addPendingMembers = newValue} - } + var addPendingMembers: [GroupsProtos_GroupChange.Actions.AddPendingMemberAction] = [] /// Pending members deleted - var deletePendingMembers: [GroupsProtos_GroupChange.Actions.DeletePendingMemberAction] { - get {return _storage._deletePendingMembers} - set {_uniqueStorage()._deletePendingMembers = newValue} - } + var deletePendingMembers: [GroupsProtos_GroupChange.Actions.DeletePendingMemberAction] = [] /// Pending invitations accepted - var promotePendingMembers: [GroupsProtos_GroupChange.Actions.PromotePendingMemberAction] { - get {return _storage._promotePendingMembers} - set {_uniqueStorage()._promotePendingMembers = newValue} - } + var promotePendingMembers: [GroupsProtos_GroupChange.Actions.PromotePendingMemberAction] = [] /// Changed title var modifyTitle: GroupsProtos_GroupChange.Actions.ModifyTitleAction { - get {return _storage._modifyTitle ?? GroupsProtos_GroupChange.Actions.ModifyTitleAction()} - set {_uniqueStorage()._modifyTitle = newValue} + get {return _modifyTitle ?? GroupsProtos_GroupChange.Actions.ModifyTitleAction()} + set {_modifyTitle = newValue} } /// Returns true if `modifyTitle` has been explicitly set. - var hasModifyTitle: Bool {return _storage._modifyTitle != nil} + var hasModifyTitle: Bool {return self._modifyTitle != nil} /// Clears the value of `modifyTitle`. Subsequent reads from it will return its default value. - mutating func clearModifyTitle() {_uniqueStorage()._modifyTitle = nil} + mutating func clearModifyTitle() {self._modifyTitle = nil} /// Changed avatar var modifyAvatar: GroupsProtos_GroupChange.Actions.ModifyAvatarAction { - get {return _storage._modifyAvatar ?? GroupsProtos_GroupChange.Actions.ModifyAvatarAction()} - set {_uniqueStorage()._modifyAvatar = newValue} + get {return _modifyAvatar ?? GroupsProtos_GroupChange.Actions.ModifyAvatarAction()} + set {_modifyAvatar = newValue} } /// Returns true if `modifyAvatar` has been explicitly set. - var hasModifyAvatar: Bool {return _storage._modifyAvatar != nil} + var hasModifyAvatar: Bool {return self._modifyAvatar != nil} /// Clears the value of `modifyAvatar`. Subsequent reads from it will return its default value. - mutating func clearModifyAvatar() {_uniqueStorage()._modifyAvatar = nil} + mutating func clearModifyAvatar() {self._modifyAvatar = nil} /// Changed timer var modifyDisappearingMessagesTimer: GroupsProtos_GroupChange.Actions.ModifyDisappearingMessagesTimerAction { - get {return _storage._modifyDisappearingMessagesTimer ?? GroupsProtos_GroupChange.Actions.ModifyDisappearingMessagesTimerAction()} - set {_uniqueStorage()._modifyDisappearingMessagesTimer = newValue} + get {return _modifyDisappearingMessagesTimer ?? GroupsProtos_GroupChange.Actions.ModifyDisappearingMessagesTimerAction()} + set {_modifyDisappearingMessagesTimer = newValue} } /// Returns true if `modifyDisappearingMessagesTimer` has been explicitly set. - var hasModifyDisappearingMessagesTimer: Bool {return _storage._modifyDisappearingMessagesTimer != nil} + var hasModifyDisappearingMessagesTimer: Bool {return self._modifyDisappearingMessagesTimer != nil} /// Clears the value of `modifyDisappearingMessagesTimer`. Subsequent reads from it will return its default value. - mutating func clearModifyDisappearingMessagesTimer() {_uniqueStorage()._modifyDisappearingMessagesTimer = nil} + mutating func clearModifyDisappearingMessagesTimer() {self._modifyDisappearingMessagesTimer = nil} /// Changed attributes access control var modifyAttributesAccess: GroupsProtos_GroupChange.Actions.ModifyAttributesAccessControlAction { - get {return _storage._modifyAttributesAccess ?? GroupsProtos_GroupChange.Actions.ModifyAttributesAccessControlAction()} - set {_uniqueStorage()._modifyAttributesAccess = newValue} + get {return _modifyAttributesAccess ?? GroupsProtos_GroupChange.Actions.ModifyAttributesAccessControlAction()} + set {_modifyAttributesAccess = newValue} } /// Returns true if `modifyAttributesAccess` has been explicitly set. - var hasModifyAttributesAccess: Bool {return _storage._modifyAttributesAccess != nil} + var hasModifyAttributesAccess: Bool {return self._modifyAttributesAccess != nil} /// Clears the value of `modifyAttributesAccess`. Subsequent reads from it will return its default value. - mutating func clearModifyAttributesAccess() {_uniqueStorage()._modifyAttributesAccess = nil} + mutating func clearModifyAttributesAccess() {self._modifyAttributesAccess = nil} /// Changed membership access control var modifyMemberAccess: GroupsProtos_GroupChange.Actions.ModifyMembersAccessControlAction { - get {return _storage._modifyMemberAccess ?? GroupsProtos_GroupChange.Actions.ModifyMembersAccessControlAction()} - set {_uniqueStorage()._modifyMemberAccess = newValue} + get {return _modifyMemberAccess ?? GroupsProtos_GroupChange.Actions.ModifyMembersAccessControlAction()} + set {_modifyMemberAccess = newValue} } /// Returns true if `modifyMemberAccess` has been explicitly set. - var hasModifyMemberAccess: Bool {return _storage._modifyMemberAccess != nil} + var hasModifyMemberAccess: Bool {return self._modifyMemberAccess != nil} /// Clears the value of `modifyMemberAccess`. Subsequent reads from it will return its default value. - mutating func clearModifyMemberAccess() {_uniqueStorage()._modifyMemberAccess = nil} + mutating func clearModifyMemberAccess() {self._modifyMemberAccess = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -411,19 +357,19 @@ struct GroupsProtos_GroupChange { // methods supported on all messages. var added: GroupsProtos_Member { - get {return _storage._added ?? GroupsProtos_Member()} - set {_uniqueStorage()._added = newValue} + get {return _added ?? GroupsProtos_Member()} + set {_added = newValue} } /// Returns true if `added` has been explicitly set. - var hasAdded: Bool {return _storage._added != nil} + var hasAdded: Bool {return self._added != nil} /// Clears the value of `added`. Subsequent reads from it will return its default value. - mutating func clearAdded() {_uniqueStorage()._added = nil} + mutating func clearAdded() {self._added = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _added: GroupsProtos_Member? } struct DeleteMemberAction { @@ -470,19 +416,19 @@ struct GroupsProtos_GroupChange { // methods supported on all messages. var added: GroupsProtos_PendingMember { - get {return _storage._added ?? GroupsProtos_PendingMember()} - set {_uniqueStorage()._added = newValue} + get {return _added ?? GroupsProtos_PendingMember()} + set {_added = newValue} } /// Returns true if `added` has been explicitly set. - var hasAdded: Bool {return _storage._added != nil} + var hasAdded: Bool {return self._added != nil} /// Clears the value of `added`. Subsequent reads from it will return its default value. - mutating func clearAdded() {_uniqueStorage()._added = nil} + mutating func clearAdded() {self._added = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _added: GroupsProtos_PendingMember? } struct DeletePendingMemberAction { @@ -583,7 +529,11 @@ struct GroupsProtos_GroupChange { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _modifyTitle: GroupsProtos_GroupChange.Actions.ModifyTitleAction? + fileprivate var _modifyAvatar: GroupsProtos_GroupChange.Actions.ModifyAvatarAction? + fileprivate var _modifyDisappearingMessagesTimer: GroupsProtos_GroupChange.Actions.ModifyDisappearingMessagesTimerAction? + fileprivate var _modifyAttributesAccess: GroupsProtos_GroupChange.Actions.ModifyAttributesAccessControlAction? + fileprivate var _modifyMemberAccess: GroupsProtos_GroupChange.Actions.ModifyMembersAccessControlAction? } init() {} @@ -604,28 +554,29 @@ struct GroupsProtos_GroupChanges { // methods supported on all messages. var groupChange: GroupsProtos_GroupChange { - get {return _storage._groupChange ?? GroupsProtos_GroupChange()} - set {_uniqueStorage()._groupChange = newValue} + get {return _groupChange ?? GroupsProtos_GroupChange()} + set {_groupChange = newValue} } /// Returns true if `groupChange` has been explicitly set. - var hasGroupChange: Bool {return _storage._groupChange != nil} + var hasGroupChange: Bool {return self._groupChange != nil} /// Clears the value of `groupChange`. Subsequent reads from it will return its default value. - mutating func clearGroupChange() {_uniqueStorage()._groupChange = nil} + mutating func clearGroupChange() {self._groupChange = nil} var groupState: GroupsProtos_Group { - get {return _storage._groupState ?? GroupsProtos_Group()} - set {_uniqueStorage()._groupState = newValue} + get {return _groupState ?? GroupsProtos_Group()} + set {_groupState = newValue} } /// Returns true if `groupState` has been explicitly set. - var hasGroupState: Bool {return _storage._groupState != nil} + var hasGroupState: Bool {return self._groupState != nil} /// Clears the value of `groupState`. Subsequent reads from it will return its default value. - mutating func clearGroupState() {_uniqueStorage()._groupState = nil} + mutating func clearGroupState() {self._groupState = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _groupChange: GroupsProtos_GroupChange? + fileprivate var _groupState: GroupsProtos_Group? } init() {} @@ -781,70 +732,34 @@ extension GroupsProtos_PendingMember: SwiftProtobuf.Message, SwiftProtobuf._Mess 3: .same(proto: "timestamp") ] - fileprivate class _StorageClass { - var _member: GroupsProtos_Member? - var _addedByUserID: Data = SwiftProtobuf.Internal.emptyData - var _timestamp: UInt64 = 0 - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _member = source._member - _addedByUserID = source._addedByUserID - _timestamp = source._timestamp - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._member) - case 2: try decoder.decodeSingularBytesField(value: &_storage._addedByUserID) - case 3: try decoder.decodeSingularUInt64Field(value: &_storage._timestamp) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._member) + case 2: try decoder.decodeSingularBytesField(value: &self.addedByUserID) + case 3: try decoder.decodeSingularUInt64Field(value: &self.timestamp) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._member { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if !_storage._addedByUserID.isEmpty { - try visitor.visitSingularBytesField(value: _storage._addedByUserID, fieldNumber: 2) - } - if _storage._timestamp != 0 { - try visitor.visitSingularUInt64Field(value: _storage._timestamp, fieldNumber: 3) - } + if let v = self._member { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if !self.addedByUserID.isEmpty { + try visitor.visitSingularBytesField(value: self.addedByUserID, fieldNumber: 2) + } + if self.timestamp != 0 { + try visitor.visitSingularUInt64Field(value: self.timestamp, fieldNumber: 3) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: GroupsProtos_PendingMember, rhs: GroupsProtos_PendingMember) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._member != rhs_storage._member {return false} - if _storage._addedByUserID != rhs_storage._addedByUserID {return false} - if _storage._timestamp != rhs_storage._timestamp {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._member != rhs._member {return false} + if lhs.addedByUserID != rhs.addedByUserID {return false} + if lhs.timestamp != rhs.timestamp {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -907,105 +822,59 @@ extension GroupsProtos_Group: SwiftProtobuf.Message, SwiftProtobuf._MessageImple 8: .same(proto: "pendingMembers") ] - fileprivate class _StorageClass { - var _publicKey: Data = SwiftProtobuf.Internal.emptyData - var _title: Data = SwiftProtobuf.Internal.emptyData - var _avatar: String = String() - var _disappearingMessagesTimer: Data = SwiftProtobuf.Internal.emptyData - var _accessControl: GroupsProtos_AccessControl? - var _version: UInt32 = 0 - var _members: [GroupsProtos_Member] = [] - var _pendingMembers: [GroupsProtos_PendingMember] = [] - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _publicKey = source._publicKey - _title = source._title - _avatar = source._avatar - _disappearingMessagesTimer = source._disappearingMessagesTimer - _accessControl = source._accessControl - _version = source._version - _members = source._members - _pendingMembers = source._pendingMembers - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularBytesField(value: &_storage._publicKey) - case 2: try decoder.decodeSingularBytesField(value: &_storage._title) - case 3: try decoder.decodeSingularStringField(value: &_storage._avatar) - case 4: try decoder.decodeSingularBytesField(value: &_storage._disappearingMessagesTimer) - case 5: try decoder.decodeSingularMessageField(value: &_storage._accessControl) - case 6: try decoder.decodeSingularUInt32Field(value: &_storage._version) - case 7: try decoder.decodeRepeatedMessageField(value: &_storage._members) - case 8: try decoder.decodeRepeatedMessageField(value: &_storage._pendingMembers) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularBytesField(value: &self.publicKey) + case 2: try decoder.decodeSingularBytesField(value: &self.title) + case 3: try decoder.decodeSingularStringField(value: &self.avatar) + case 4: try decoder.decodeSingularBytesField(value: &self.disappearingMessagesTimer) + case 5: try decoder.decodeSingularMessageField(value: &self._accessControl) + case 6: try decoder.decodeSingularUInt32Field(value: &self.version) + case 7: try decoder.decodeRepeatedMessageField(value: &self.members) + case 8: try decoder.decodeRepeatedMessageField(value: &self.pendingMembers) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if !_storage._publicKey.isEmpty { - try visitor.visitSingularBytesField(value: _storage._publicKey, fieldNumber: 1) - } - if !_storage._title.isEmpty { - try visitor.visitSingularBytesField(value: _storage._title, fieldNumber: 2) - } - if !_storage._avatar.isEmpty { - try visitor.visitSingularStringField(value: _storage._avatar, fieldNumber: 3) - } - if !_storage._disappearingMessagesTimer.isEmpty { - try visitor.visitSingularBytesField(value: _storage._disappearingMessagesTimer, fieldNumber: 4) - } - if let v = _storage._accessControl { - try visitor.visitSingularMessageField(value: v, fieldNumber: 5) - } - if _storage._version != 0 { - try visitor.visitSingularUInt32Field(value: _storage._version, fieldNumber: 6) - } - if !_storage._members.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._members, fieldNumber: 7) - } - if !_storage._pendingMembers.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._pendingMembers, fieldNumber: 8) - } + if !self.publicKey.isEmpty { + try visitor.visitSingularBytesField(value: self.publicKey, fieldNumber: 1) + } + if !self.title.isEmpty { + try visitor.visitSingularBytesField(value: self.title, fieldNumber: 2) + } + if !self.avatar.isEmpty { + try visitor.visitSingularStringField(value: self.avatar, fieldNumber: 3) + } + if !self.disappearingMessagesTimer.isEmpty { + try visitor.visitSingularBytesField(value: self.disappearingMessagesTimer, fieldNumber: 4) + } + if let v = self._accessControl { + try visitor.visitSingularMessageField(value: v, fieldNumber: 5) + } + if self.version != 0 { + try visitor.visitSingularUInt32Field(value: self.version, fieldNumber: 6) + } + if !self.members.isEmpty { + try visitor.visitRepeatedMessageField(value: self.members, fieldNumber: 7) + } + if !self.pendingMembers.isEmpty { + try visitor.visitRepeatedMessageField(value: self.pendingMembers, fieldNumber: 8) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: GroupsProtos_Group, rhs: GroupsProtos_Group) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._publicKey != rhs_storage._publicKey {return false} - if _storage._title != rhs_storage._title {return false} - if _storage._avatar != rhs_storage._avatar {return false} - if _storage._disappearingMessagesTimer != rhs_storage._disappearingMessagesTimer {return false} - if _storage._accessControl != rhs_storage._accessControl {return false} - if _storage._version != rhs_storage._version {return false} - if _storage._members != rhs_storage._members {return false} - if _storage._pendingMembers != rhs_storage._pendingMembers {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs.publicKey != rhs.publicKey {return false} + if lhs.title != rhs.title {return false} + if lhs.avatar != rhs.avatar {return false} + if lhs.disappearingMessagesTimer != rhs.disappearingMessagesTimer {return false} + if lhs._accessControl != rhs._accessControl {return false} + if lhs.version != rhs.version {return false} + if lhs.members != rhs.members {return false} + if lhs.pendingMembers != rhs.pendingMembers {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -1065,147 +934,89 @@ extension GroupsProtos_GroupChange.Actions: SwiftProtobuf.Message, SwiftProtobuf 14: .same(proto: "modifyMemberAccess") ] - fileprivate class _StorageClass { - var _sourceUuid: Data = SwiftProtobuf.Internal.emptyData - var _version: UInt32 = 0 - var _addMembers: [GroupsProtos_GroupChange.Actions.AddMemberAction] = [] - var _deleteMembers: [GroupsProtos_GroupChange.Actions.DeleteMemberAction] = [] - var _modifyMemberRoles: [GroupsProtos_GroupChange.Actions.ModifyMemberRoleAction] = [] - var _modifyMemberProfileKeys: [GroupsProtos_GroupChange.Actions.ModifyMemberProfileKeyAction] = [] - var _addPendingMembers: [GroupsProtos_GroupChange.Actions.AddPendingMemberAction] = [] - var _deletePendingMembers: [GroupsProtos_GroupChange.Actions.DeletePendingMemberAction] = [] - var _promotePendingMembers: [GroupsProtos_GroupChange.Actions.PromotePendingMemberAction] = [] - var _modifyTitle: GroupsProtos_GroupChange.Actions.ModifyTitleAction? - var _modifyAvatar: GroupsProtos_GroupChange.Actions.ModifyAvatarAction? - var _modifyDisappearingMessagesTimer: GroupsProtos_GroupChange.Actions.ModifyDisappearingMessagesTimerAction? - var _modifyAttributesAccess: GroupsProtos_GroupChange.Actions.ModifyAttributesAccessControlAction? - var _modifyMemberAccess: GroupsProtos_GroupChange.Actions.ModifyMembersAccessControlAction? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _sourceUuid = source._sourceUuid - _version = source._version - _addMembers = source._addMembers - _deleteMembers = source._deleteMembers - _modifyMemberRoles = source._modifyMemberRoles - _modifyMemberProfileKeys = source._modifyMemberProfileKeys - _addPendingMembers = source._addPendingMembers - _deletePendingMembers = source._deletePendingMembers - _promotePendingMembers = source._promotePendingMembers - _modifyTitle = source._modifyTitle - _modifyAvatar = source._modifyAvatar - _modifyDisappearingMessagesTimer = source._modifyDisappearingMessagesTimer - _modifyAttributesAccess = source._modifyAttributesAccess - _modifyMemberAccess = source._modifyMemberAccess - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularBytesField(value: &_storage._sourceUuid) - case 2: try decoder.decodeSingularUInt32Field(value: &_storage._version) - case 3: try decoder.decodeRepeatedMessageField(value: &_storage._addMembers) - case 4: try decoder.decodeRepeatedMessageField(value: &_storage._deleteMembers) - case 5: try decoder.decodeRepeatedMessageField(value: &_storage._modifyMemberRoles) - case 6: try decoder.decodeRepeatedMessageField(value: &_storage._modifyMemberProfileKeys) - case 7: try decoder.decodeRepeatedMessageField(value: &_storage._addPendingMembers) - case 8: try decoder.decodeRepeatedMessageField(value: &_storage._deletePendingMembers) - case 9: try decoder.decodeRepeatedMessageField(value: &_storage._promotePendingMembers) - case 10: try decoder.decodeSingularMessageField(value: &_storage._modifyTitle) - case 11: try decoder.decodeSingularMessageField(value: &_storage._modifyAvatar) - case 12: try decoder.decodeSingularMessageField(value: &_storage._modifyDisappearingMessagesTimer) - case 13: try decoder.decodeSingularMessageField(value: &_storage._modifyAttributesAccess) - case 14: try decoder.decodeSingularMessageField(value: &_storage._modifyMemberAccess) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularBytesField(value: &self.sourceUuid) + case 2: try decoder.decodeSingularUInt32Field(value: &self.version) + case 3: try decoder.decodeRepeatedMessageField(value: &self.addMembers) + case 4: try decoder.decodeRepeatedMessageField(value: &self.deleteMembers) + case 5: try decoder.decodeRepeatedMessageField(value: &self.modifyMemberRoles) + case 6: try decoder.decodeRepeatedMessageField(value: &self.modifyMemberProfileKeys) + case 7: try decoder.decodeRepeatedMessageField(value: &self.addPendingMembers) + case 8: try decoder.decodeRepeatedMessageField(value: &self.deletePendingMembers) + case 9: try decoder.decodeRepeatedMessageField(value: &self.promotePendingMembers) + case 10: try decoder.decodeSingularMessageField(value: &self._modifyTitle) + case 11: try decoder.decodeSingularMessageField(value: &self._modifyAvatar) + case 12: try decoder.decodeSingularMessageField(value: &self._modifyDisappearingMessagesTimer) + case 13: try decoder.decodeSingularMessageField(value: &self._modifyAttributesAccess) + case 14: try decoder.decodeSingularMessageField(value: &self._modifyMemberAccess) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if !_storage._sourceUuid.isEmpty { - try visitor.visitSingularBytesField(value: _storage._sourceUuid, fieldNumber: 1) - } - if _storage._version != 0 { - try visitor.visitSingularUInt32Field(value: _storage._version, fieldNumber: 2) - } - if !_storage._addMembers.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._addMembers, fieldNumber: 3) - } - if !_storage._deleteMembers.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._deleteMembers, fieldNumber: 4) - } - if !_storage._modifyMemberRoles.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._modifyMemberRoles, fieldNumber: 5) - } - if !_storage._modifyMemberProfileKeys.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._modifyMemberProfileKeys, fieldNumber: 6) - } - if !_storage._addPendingMembers.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._addPendingMembers, fieldNumber: 7) - } - if !_storage._deletePendingMembers.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._deletePendingMembers, fieldNumber: 8) - } - if !_storage._promotePendingMembers.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._promotePendingMembers, fieldNumber: 9) - } - if let v = _storage._modifyTitle { - try visitor.visitSingularMessageField(value: v, fieldNumber: 10) - } - if let v = _storage._modifyAvatar { - try visitor.visitSingularMessageField(value: v, fieldNumber: 11) - } - if let v = _storage._modifyDisappearingMessagesTimer { - try visitor.visitSingularMessageField(value: v, fieldNumber: 12) - } - if let v = _storage._modifyAttributesAccess { - try visitor.visitSingularMessageField(value: v, fieldNumber: 13) - } - if let v = _storage._modifyMemberAccess { - try visitor.visitSingularMessageField(value: v, fieldNumber: 14) - } + if !self.sourceUuid.isEmpty { + try visitor.visitSingularBytesField(value: self.sourceUuid, fieldNumber: 1) + } + if self.version != 0 { + try visitor.visitSingularUInt32Field(value: self.version, fieldNumber: 2) + } + if !self.addMembers.isEmpty { + try visitor.visitRepeatedMessageField(value: self.addMembers, fieldNumber: 3) + } + if !self.deleteMembers.isEmpty { + try visitor.visitRepeatedMessageField(value: self.deleteMembers, fieldNumber: 4) + } + if !self.modifyMemberRoles.isEmpty { + try visitor.visitRepeatedMessageField(value: self.modifyMemberRoles, fieldNumber: 5) + } + if !self.modifyMemberProfileKeys.isEmpty { + try visitor.visitRepeatedMessageField(value: self.modifyMemberProfileKeys, fieldNumber: 6) + } + if !self.addPendingMembers.isEmpty { + try visitor.visitRepeatedMessageField(value: self.addPendingMembers, fieldNumber: 7) + } + if !self.deletePendingMembers.isEmpty { + try visitor.visitRepeatedMessageField(value: self.deletePendingMembers, fieldNumber: 8) + } + if !self.promotePendingMembers.isEmpty { + try visitor.visitRepeatedMessageField(value: self.promotePendingMembers, fieldNumber: 9) + } + if let v = self._modifyTitle { + try visitor.visitSingularMessageField(value: v, fieldNumber: 10) + } + if let v = self._modifyAvatar { + try visitor.visitSingularMessageField(value: v, fieldNumber: 11) + } + if let v = self._modifyDisappearingMessagesTimer { + try visitor.visitSingularMessageField(value: v, fieldNumber: 12) + } + if let v = self._modifyAttributesAccess { + try visitor.visitSingularMessageField(value: v, fieldNumber: 13) + } + if let v = self._modifyMemberAccess { + try visitor.visitSingularMessageField(value: v, fieldNumber: 14) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: GroupsProtos_GroupChange.Actions, rhs: GroupsProtos_GroupChange.Actions) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._sourceUuid != rhs_storage._sourceUuid {return false} - if _storage._version != rhs_storage._version {return false} - if _storage._addMembers != rhs_storage._addMembers {return false} - if _storage._deleteMembers != rhs_storage._deleteMembers {return false} - if _storage._modifyMemberRoles != rhs_storage._modifyMemberRoles {return false} - if _storage._modifyMemberProfileKeys != rhs_storage._modifyMemberProfileKeys {return false} - if _storage._addPendingMembers != rhs_storage._addPendingMembers {return false} - if _storage._deletePendingMembers != rhs_storage._deletePendingMembers {return false} - if _storage._promotePendingMembers != rhs_storage._promotePendingMembers {return false} - if _storage._modifyTitle != rhs_storage._modifyTitle {return false} - if _storage._modifyAvatar != rhs_storage._modifyAvatar {return false} - if _storage._modifyDisappearingMessagesTimer != rhs_storage._modifyDisappearingMessagesTimer {return false} - if _storage._modifyAttributesAccess != rhs_storage._modifyAttributesAccess {return false} - if _storage._modifyMemberAccess != rhs_storage._modifyMemberAccess {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs.sourceUuid != rhs.sourceUuid {return false} + if lhs.version != rhs.version {return false} + if lhs.addMembers != rhs.addMembers {return false} + if lhs.deleteMembers != rhs.deleteMembers {return false} + if lhs.modifyMemberRoles != rhs.modifyMemberRoles {return false} + if lhs.modifyMemberProfileKeys != rhs.modifyMemberProfileKeys {return false} + if lhs.addPendingMembers != rhs.addPendingMembers {return false} + if lhs.deletePendingMembers != rhs.deletePendingMembers {return false} + if lhs.promotePendingMembers != rhs.promotePendingMembers {return false} + if lhs._modifyTitle != rhs._modifyTitle {return false} + if lhs._modifyAvatar != rhs._modifyAvatar {return false} + if lhs._modifyDisappearingMessagesTimer != rhs._modifyDisappearingMessagesTimer {return false} + if lhs._modifyAttributesAccess != rhs._modifyAttributesAccess {return false} + if lhs._modifyMemberAccess != rhs._modifyMemberAccess {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -1217,56 +1028,24 @@ extension GroupsProtos_GroupChange.Actions.AddMemberAction: SwiftProtobuf.Messag 1: .same(proto: "added") ] - fileprivate class _StorageClass { - var _added: GroupsProtos_Member? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _added = source._added - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._added) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._added) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._added { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } + if let v = self._added { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: GroupsProtos_GroupChange.Actions.AddMemberAction, rhs: GroupsProtos_GroupChange.Actions.AddMemberAction) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._added != rhs_storage._added {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._added != rhs._added {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -1371,56 +1150,24 @@ extension GroupsProtos_GroupChange.Actions.AddPendingMemberAction: SwiftProtobuf 1: .same(proto: "added") ] - fileprivate class _StorageClass { - var _added: GroupsProtos_PendingMember? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _added = source._added - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._added) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._added) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._added { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } + if let v = self._added { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: GroupsProtos_GroupChange.Actions.AddPendingMemberAction, rhs: GroupsProtos_GroupChange.Actions.AddPendingMemberAction) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._added != rhs_storage._added {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._added != rhs._added {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -1694,63 +1441,29 @@ extension GroupsProtos_GroupChanges.GroupChangeState: SwiftProtobuf.Message, Swi 2: .same(proto: "groupState") ] - fileprivate class _StorageClass { - var _groupChange: GroupsProtos_GroupChange? - var _groupState: GroupsProtos_Group? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _groupChange = source._groupChange - _groupState = source._groupState - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._groupChange) - case 2: try decoder.decodeSingularMessageField(value: &_storage._groupState) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._groupChange) + case 2: try decoder.decodeSingularMessageField(value: &self._groupState) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._groupChange { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if let v = _storage._groupState { - try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - } + if let v = self._groupChange { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if let v = self._groupState { + try visitor.visitSingularMessageField(value: v, fieldNumber: 2) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: GroupsProtos_GroupChanges.GroupChangeState, rhs: GroupsProtos_GroupChanges.GroupChangeState) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._groupChange != rhs_storage._groupChange {return false} - if _storage._groupState != rhs_storage._groupState {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._groupChange != rhs._groupChange {return false} + if lhs._groupState != rhs._groupState {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } diff --git a/SignalServiceKit/src/Protos/Generated/KeyBackup.pb.swift b/SignalServiceKit/src/Protos/Generated/KeyBackup.pb.swift index d4ecf9c173..43430c142c 100644 --- a/SignalServiceKit/src/Protos/Generated/KeyBackup.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/KeyBackup.pb.swift @@ -14,7 +14,7 @@ import SwiftProtobuf // If the compiler emits an error on this type, it is because this file // was generated by a version of the `protoc` Swift plug-in that is // incompatible with the version of SwiftProtobuf to which you are linking. -// Please ensure that your are building against the same version of the API +// Please ensure that you are building against the same version of the API // that was used to generate this file. private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} @@ -27,37 +27,39 @@ struct KeyBackupProtos_Request { // methods supported on all messages. var backup: KeyBackupProtos_BackupRequest { - get {return _storage._backup ?? KeyBackupProtos_BackupRequest()} - set {_uniqueStorage()._backup = newValue} + get {return _backup ?? KeyBackupProtos_BackupRequest()} + set {_backup = newValue} } /// Returns true if `backup` has been explicitly set. - var hasBackup: Bool {return _storage._backup != nil} + var hasBackup: Bool {return self._backup != nil} /// Clears the value of `backup`. Subsequent reads from it will return its default value. - mutating func clearBackup() {_uniqueStorage()._backup = nil} + mutating func clearBackup() {self._backup = nil} var restore: KeyBackupProtos_RestoreRequest { - get {return _storage._restore ?? KeyBackupProtos_RestoreRequest()} - set {_uniqueStorage()._restore = newValue} + get {return _restore ?? KeyBackupProtos_RestoreRequest()} + set {_restore = newValue} } /// Returns true if `restore` has been explicitly set. - var hasRestore: Bool {return _storage._restore != nil} + var hasRestore: Bool {return self._restore != nil} /// Clears the value of `restore`. Subsequent reads from it will return its default value. - mutating func clearRestore() {_uniqueStorage()._restore = nil} + mutating func clearRestore() {self._restore = nil} var delete: KeyBackupProtos_DeleteRequest { - get {return _storage._delete ?? KeyBackupProtos_DeleteRequest()} - set {_uniqueStorage()._delete = newValue} + get {return _delete ?? KeyBackupProtos_DeleteRequest()} + set {_delete = newValue} } /// Returns true if `delete` has been explicitly set. - var hasDelete: Bool {return _storage._delete != nil} + var hasDelete: Bool {return self._delete != nil} /// Clears the value of `delete`. Subsequent reads from it will return its default value. - mutating func clearDelete() {_uniqueStorage()._delete = nil} + mutating func clearDelete() {self._delete = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _backup: KeyBackupProtos_BackupRequest? + fileprivate var _restore: KeyBackupProtos_RestoreRequest? + fileprivate var _delete: KeyBackupProtos_DeleteRequest? } struct KeyBackupProtos_Response { @@ -66,37 +68,39 @@ struct KeyBackupProtos_Response { // methods supported on all messages. var backup: KeyBackupProtos_BackupResponse { - get {return _storage._backup ?? KeyBackupProtos_BackupResponse()} - set {_uniqueStorage()._backup = newValue} + get {return _backup ?? KeyBackupProtos_BackupResponse()} + set {_backup = newValue} } /// Returns true if `backup` has been explicitly set. - var hasBackup: Bool {return _storage._backup != nil} + var hasBackup: Bool {return self._backup != nil} /// Clears the value of `backup`. Subsequent reads from it will return its default value. - mutating func clearBackup() {_uniqueStorage()._backup = nil} + mutating func clearBackup() {self._backup = nil} var restore: KeyBackupProtos_RestoreResponse { - get {return _storage._restore ?? KeyBackupProtos_RestoreResponse()} - set {_uniqueStorage()._restore = newValue} + get {return _restore ?? KeyBackupProtos_RestoreResponse()} + set {_restore = newValue} } /// Returns true if `restore` has been explicitly set. - var hasRestore: Bool {return _storage._restore != nil} + var hasRestore: Bool {return self._restore != nil} /// Clears the value of `restore`. Subsequent reads from it will return its default value. - mutating func clearRestore() {_uniqueStorage()._restore = nil} + mutating func clearRestore() {self._restore = nil} var delete: KeyBackupProtos_DeleteResponse { - get {return _storage._delete ?? KeyBackupProtos_DeleteResponse()} - set {_uniqueStorage()._delete = newValue} + get {return _delete ?? KeyBackupProtos_DeleteResponse()} + set {_delete = newValue} } /// Returns true if `delete` has been explicitly set. - var hasDelete: Bool {return _storage._delete != nil} + var hasDelete: Bool {return self._delete != nil} /// Clears the value of `delete`. Subsequent reads from it will return its default value. - mutating func clearDelete() {_uniqueStorage()._delete = nil} + mutating func clearDelete() {self._delete = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _backup: KeyBackupProtos_BackupResponse? + fileprivate var _restore: KeyBackupProtos_RestoreResponse? + fileprivate var _delete: KeyBackupProtos_DeleteResponse? } struct KeyBackupProtos_BackupRequest { @@ -456,70 +460,34 @@ extension KeyBackupProtos_Request: SwiftProtobuf.Message, SwiftProtobuf._Message 3: .same(proto: "delete") ] - fileprivate class _StorageClass { - var _backup: KeyBackupProtos_BackupRequest? - var _restore: KeyBackupProtos_RestoreRequest? - var _delete: KeyBackupProtos_DeleteRequest? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _backup = source._backup - _restore = source._restore - _delete = source._delete - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._backup) - case 2: try decoder.decodeSingularMessageField(value: &_storage._restore) - case 3: try decoder.decodeSingularMessageField(value: &_storage._delete) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._backup) + case 2: try decoder.decodeSingularMessageField(value: &self._restore) + case 3: try decoder.decodeSingularMessageField(value: &self._delete) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._backup { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if let v = _storage._restore { - try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - } - if let v = _storage._delete { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } + if let v = self._backup { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if let v = self._restore { + try visitor.visitSingularMessageField(value: v, fieldNumber: 2) + } + if let v = self._delete { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: KeyBackupProtos_Request, rhs: KeyBackupProtos_Request) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._backup != rhs_storage._backup {return false} - if _storage._restore != rhs_storage._restore {return false} - if _storage._delete != rhs_storage._delete {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._backup != rhs._backup {return false} + if lhs._restore != rhs._restore {return false} + if lhs._delete != rhs._delete {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -533,70 +501,34 @@ extension KeyBackupProtos_Response: SwiftProtobuf.Message, SwiftProtobuf._Messag 3: .same(proto: "delete") ] - fileprivate class _StorageClass { - var _backup: KeyBackupProtos_BackupResponse? - var _restore: KeyBackupProtos_RestoreResponse? - var _delete: KeyBackupProtos_DeleteResponse? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _backup = source._backup - _restore = source._restore - _delete = source._delete - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._backup) - case 2: try decoder.decodeSingularMessageField(value: &_storage._restore) - case 3: try decoder.decodeSingularMessageField(value: &_storage._delete) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._backup) + case 2: try decoder.decodeSingularMessageField(value: &self._restore) + case 3: try decoder.decodeSingularMessageField(value: &self._delete) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._backup { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if let v = _storage._restore { - try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - } - if let v = _storage._delete { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } + if let v = self._backup { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if let v = self._restore { + try visitor.visitSingularMessageField(value: v, fieldNumber: 2) + } + if let v = self._delete { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: KeyBackupProtos_Response, rhs: KeyBackupProtos_Response) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._backup != rhs_storage._backup {return false} - if _storage._restore != rhs_storage._restore {return false} - if _storage._delete != rhs_storage._delete {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._backup != rhs._backup {return false} + if lhs._restore != rhs._restore {return false} + if lhs._delete != rhs._delete {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } diff --git a/SignalServiceKit/src/Protos/Generated/Provisioning.pb.swift b/SignalServiceKit/src/Protos/Generated/Provisioning.pb.swift index 8ae83e22b1..8bde592f69 100644 --- a/SignalServiceKit/src/Protos/Generated/Provisioning.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/Provisioning.pb.swift @@ -16,7 +16,7 @@ import SwiftProtobuf // If the compiler emits an error on this type, it is because this file // was generated by a version of the `protoc` Swift plug-in that is // incompatible with the version of SwiftProtobuf to which you are linking. -// Please ensure that your are building against the same version of the API +// Please ensure that you are building against the same version of the API // that was used to generate this file. private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index d826fa3882..14150805a4 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -8030,6 +8030,9 @@ public class SSKProtoAttachmentPointer: NSObject { if let _value = blurHash { builder.setBlurHash(_value) } + if hasUploadTimestamp { + builder.setUploadTimestamp(uploadTimestamp) + } return builder } @@ -8150,6 +8153,11 @@ public class SSKProtoAttachmentPointer: NSObject { proto.blurHash = valueParam } + @objc + public func setUploadTimestamp(_ valueParam: UInt64) { + proto.uploadTimestamp = valueParam + } + @objc public func build() throws -> SSKProtoAttachmentPointer { return try SSKProtoAttachmentPointer.parseProto(proto) @@ -8286,6 +8294,15 @@ public class SSKProtoAttachmentPointer: NSObject { return proto.hasBlurHash } + @objc + public var uploadTimestamp: UInt64 { + return proto.uploadTimestamp + } + @objc + public var hasUploadTimestamp: Bool { + return proto.hasUploadTimestamp + } + private init(proto: SignalServiceProtos_AttachmentPointer, id: UInt64) { self.proto = proto diff --git a/SignalServiceKit/src/Protos/Generated/SignalIOS.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalIOS.pb.swift index 76b0d05350..338d8a73bf 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalIOS.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalIOS.pb.swift @@ -16,7 +16,7 @@ import SwiftProtobuf // If the compiler emits an error on this type, it is because this file // was generated by a version of the `protoc` Swift plug-in that is // incompatible with the version of SwiftProtobuf to which you are linking. -// Please ensure that your are building against the same version of the API +// Please ensure that you are building against the same version of the API // that was used to generate this file. private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} @@ -127,6 +127,14 @@ struct IOSProtos_BackupSnapshot { init() {} } +#if swift(>=4.2) + +extension IOSProtos_BackupSnapshot.BackupEntity.TypeEnum: CaseIterable { + // Support synthesized by the compiler. +} + +#endif // swift(>=4.2) + struct IOSProtos_DeviceName { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift index 23da012cce..bf13143665 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift @@ -16,7 +16,7 @@ import SwiftProtobuf // If the compiler emits an error on this type, it is because this file // was generated by a version of the `protoc` Swift plug-in that is // incompatible with the version of SwiftProtobuf to which you are linking. -// Please ensure that your are building against the same version of the API +// Please ensure that you are building against the same version of the API // that was used to generate this file. private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} @@ -267,64 +267,69 @@ struct SignalServiceProtos_Content { // methods supported on all messages. var dataMessage: SignalServiceProtos_DataMessage { - get {return _storage._dataMessage ?? SignalServiceProtos_DataMessage()} - set {_uniqueStorage()._dataMessage = newValue} + get {return _dataMessage ?? SignalServiceProtos_DataMessage()} + set {_dataMessage = newValue} } /// Returns true if `dataMessage` has been explicitly set. - var hasDataMessage: Bool {return _storage._dataMessage != nil} + var hasDataMessage: Bool {return self._dataMessage != nil} /// Clears the value of `dataMessage`. Subsequent reads from it will return its default value. - mutating func clearDataMessage() {_uniqueStorage()._dataMessage = nil} + mutating func clearDataMessage() {self._dataMessage = nil} var syncMessage: SignalServiceProtos_SyncMessage { - get {return _storage._syncMessage ?? SignalServiceProtos_SyncMessage()} - set {_uniqueStorage()._syncMessage = newValue} + get {return _syncMessage ?? SignalServiceProtos_SyncMessage()} + set {_syncMessage = newValue} } /// Returns true if `syncMessage` has been explicitly set. - var hasSyncMessage: Bool {return _storage._syncMessage != nil} + var hasSyncMessage: Bool {return self._syncMessage != nil} /// Clears the value of `syncMessage`. Subsequent reads from it will return its default value. - mutating func clearSyncMessage() {_uniqueStorage()._syncMessage = nil} + mutating func clearSyncMessage() {self._syncMessage = nil} var callMessage: SignalServiceProtos_CallMessage { - get {return _storage._callMessage ?? SignalServiceProtos_CallMessage()} - set {_uniqueStorage()._callMessage = newValue} + get {return _callMessage ?? SignalServiceProtos_CallMessage()} + set {_callMessage = newValue} } /// Returns true if `callMessage` has been explicitly set. - var hasCallMessage: Bool {return _storage._callMessage != nil} + var hasCallMessage: Bool {return self._callMessage != nil} /// Clears the value of `callMessage`. Subsequent reads from it will return its default value. - mutating func clearCallMessage() {_uniqueStorage()._callMessage = nil} + mutating func clearCallMessage() {self._callMessage = nil} var nullMessage: SignalServiceProtos_NullMessage { - get {return _storage._nullMessage ?? SignalServiceProtos_NullMessage()} - set {_uniqueStorage()._nullMessage = newValue} + get {return _nullMessage ?? SignalServiceProtos_NullMessage()} + set {_nullMessage = newValue} } /// Returns true if `nullMessage` has been explicitly set. - var hasNullMessage: Bool {return _storage._nullMessage != nil} + var hasNullMessage: Bool {return self._nullMessage != nil} /// Clears the value of `nullMessage`. Subsequent reads from it will return its default value. - mutating func clearNullMessage() {_uniqueStorage()._nullMessage = nil} + mutating func clearNullMessage() {self._nullMessage = nil} var receiptMessage: SignalServiceProtos_ReceiptMessage { - get {return _storage._receiptMessage ?? SignalServiceProtos_ReceiptMessage()} - set {_uniqueStorage()._receiptMessage = newValue} + get {return _receiptMessage ?? SignalServiceProtos_ReceiptMessage()} + set {_receiptMessage = newValue} } /// Returns true if `receiptMessage` has been explicitly set. - var hasReceiptMessage: Bool {return _storage._receiptMessage != nil} + var hasReceiptMessage: Bool {return self._receiptMessage != nil} /// Clears the value of `receiptMessage`. Subsequent reads from it will return its default value. - mutating func clearReceiptMessage() {_uniqueStorage()._receiptMessage = nil} + mutating func clearReceiptMessage() {self._receiptMessage = nil} var typingMessage: SignalServiceProtos_TypingMessage { - get {return _storage._typingMessage ?? SignalServiceProtos_TypingMessage()} - set {_uniqueStorage()._typingMessage = newValue} + get {return _typingMessage ?? SignalServiceProtos_TypingMessage()} + set {_typingMessage = newValue} } /// Returns true if `typingMessage` has been explicitly set. - var hasTypingMessage: Bool {return _storage._typingMessage != nil} + var hasTypingMessage: Bool {return self._typingMessage != nil} /// Clears the value of `typingMessage`. Subsequent reads from it will return its default value. - mutating func clearTypingMessage() {_uniqueStorage()._typingMessage = nil} + mutating func clearTypingMessage() {self._typingMessage = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _dataMessage: SignalServiceProtos_DataMessage? + fileprivate var _syncMessage: SignalServiceProtos_SyncMessage? + fileprivate var _callMessage: SignalServiceProtos_CallMessage? + fileprivate var _nullMessage: SignalServiceProtos_NullMessage? + fileprivate var _receiptMessage: SignalServiceProtos_ReceiptMessage? + fileprivate var _typingMessage: SignalServiceProtos_TypingMessage? } struct SignalServiceProtos_CallMessage { @@ -333,56 +338,53 @@ struct SignalServiceProtos_CallMessage { // methods supported on all messages. var offer: SignalServiceProtos_CallMessage.Offer { - get {return _storage._offer ?? SignalServiceProtos_CallMessage.Offer()} - set {_uniqueStorage()._offer = newValue} + get {return _offer ?? SignalServiceProtos_CallMessage.Offer()} + set {_offer = newValue} } /// Returns true if `offer` has been explicitly set. - var hasOffer: Bool {return _storage._offer != nil} + var hasOffer: Bool {return self._offer != nil} /// Clears the value of `offer`. Subsequent reads from it will return its default value. - mutating func clearOffer() {_uniqueStorage()._offer = nil} + mutating func clearOffer() {self._offer = nil} var answer: SignalServiceProtos_CallMessage.Answer { - get {return _storage._answer ?? SignalServiceProtos_CallMessage.Answer()} - set {_uniqueStorage()._answer = newValue} + get {return _answer ?? SignalServiceProtos_CallMessage.Answer()} + set {_answer = newValue} } /// Returns true if `answer` has been explicitly set. - var hasAnswer: Bool {return _storage._answer != nil} + var hasAnswer: Bool {return self._answer != nil} /// Clears the value of `answer`. Subsequent reads from it will return its default value. - mutating func clearAnswer() {_uniqueStorage()._answer = nil} + mutating func clearAnswer() {self._answer = nil} - var iceUpdate: [SignalServiceProtos_CallMessage.IceUpdate] { - get {return _storage._iceUpdate} - set {_uniqueStorage()._iceUpdate = newValue} - } + var iceUpdate: [SignalServiceProtos_CallMessage.IceUpdate] = [] var hangup: SignalServiceProtos_CallMessage.Hangup { - get {return _storage._hangup ?? SignalServiceProtos_CallMessage.Hangup()} - set {_uniqueStorage()._hangup = newValue} + get {return _hangup ?? SignalServiceProtos_CallMessage.Hangup()} + set {_hangup = newValue} } /// Returns true if `hangup` has been explicitly set. - var hasHangup: Bool {return _storage._hangup != nil} + var hasHangup: Bool {return self._hangup != nil} /// Clears the value of `hangup`. Subsequent reads from it will return its default value. - mutating func clearHangup() {_uniqueStorage()._hangup = nil} + mutating func clearHangup() {self._hangup = nil} var busy: SignalServiceProtos_CallMessage.Busy { - get {return _storage._busy ?? SignalServiceProtos_CallMessage.Busy()} - set {_uniqueStorage()._busy = newValue} + get {return _busy ?? SignalServiceProtos_CallMessage.Busy()} + set {_busy = newValue} } /// Returns true if `busy` has been explicitly set. - var hasBusy: Bool {return _storage._busy != nil} + var hasBusy: Bool {return self._busy != nil} /// Clears the value of `busy`. Subsequent reads from it will return its default value. - mutating func clearBusy() {_uniqueStorage()._busy = nil} + mutating func clearBusy() {self._busy = nil} /// Signal-iOS sends profile key with call messages /// for earlier discovery var profileKey: Data { - get {return _storage._profileKey ?? SwiftProtobuf.Internal.emptyData} - set {_uniqueStorage()._profileKey = newValue} + get {return _profileKey ?? SwiftProtobuf.Internal.emptyData} + set {_profileKey = newValue} } /// Returns true if `profileKey` has been explicitly set. - var hasProfileKey: Bool {return _storage._profileKey != nil} + var hasProfileKey: Bool {return self._profileKey != nil} /// Clears the value of `profileKey`. Subsequent reads from it will return its default value. - mutating func clearProfileKey() {_uniqueStorage()._profileKey = nil} + mutating func clearProfileKey() {self._profileKey = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -557,7 +559,11 @@ struct SignalServiceProtos_CallMessage { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _offer: SignalServiceProtos_CallMessage.Offer? + fileprivate var _answer: SignalServiceProtos_CallMessage.Answer? + fileprivate var _hangup: SignalServiceProtos_CallMessage.Hangup? + fileprivate var _busy: SignalServiceProtos_CallMessage.Busy? + fileprivate var _profileKey: Data? } struct SignalServiceProtos_DataMessage { @@ -566,127 +572,118 @@ struct SignalServiceProtos_DataMessage { // methods supported on all messages. var body: String { - get {return _storage._body ?? String()} - set {_uniqueStorage()._body = newValue} + get {return _body ?? String()} + set {_body = newValue} } /// Returns true if `body` has been explicitly set. - var hasBody: Bool {return _storage._body != nil} + var hasBody: Bool {return self._body != nil} /// Clears the value of `body`. Subsequent reads from it will return its default value. - mutating func clearBody() {_uniqueStorage()._body = nil} + mutating func clearBody() {self._body = nil} - var attachments: [SignalServiceProtos_AttachmentPointer] { - get {return _storage._attachments} - set {_uniqueStorage()._attachments = newValue} - } + var attachments: [SignalServiceProtos_AttachmentPointer] = [] var group: SignalServiceProtos_GroupContext { - get {return _storage._group ?? SignalServiceProtos_GroupContext()} - set {_uniqueStorage()._group = newValue} + get {return _group ?? SignalServiceProtos_GroupContext()} + set {_group = newValue} } /// Returns true if `group` has been explicitly set. - var hasGroup: Bool {return _storage._group != nil} + var hasGroup: Bool {return self._group != nil} /// Clears the value of `group`. Subsequent reads from it will return its default value. - mutating func clearGroup() {_uniqueStorage()._group = nil} + mutating func clearGroup() {self._group = nil} var groupV2: SignalServiceProtos_GroupContextV2 { - get {return _storage._groupV2 ?? SignalServiceProtos_GroupContextV2()} - set {_uniqueStorage()._groupV2 = newValue} + get {return _groupV2 ?? SignalServiceProtos_GroupContextV2()} + set {_groupV2 = newValue} } /// Returns true if `groupV2` has been explicitly set. - var hasGroupV2: Bool {return _storage._groupV2 != nil} + var hasGroupV2: Bool {return self._groupV2 != nil} /// Clears the value of `groupV2`. Subsequent reads from it will return its default value. - mutating func clearGroupV2() {_uniqueStorage()._groupV2 = nil} + mutating func clearGroupV2() {self._groupV2 = nil} var flags: UInt32 { - get {return _storage._flags ?? 0} - set {_uniqueStorage()._flags = newValue} + get {return _flags ?? 0} + set {_flags = newValue} } /// Returns true if `flags` has been explicitly set. - var hasFlags: Bool {return _storage._flags != nil} + var hasFlags: Bool {return self._flags != nil} /// Clears the value of `flags`. Subsequent reads from it will return its default value. - mutating func clearFlags() {_uniqueStorage()._flags = nil} + mutating func clearFlags() {self._flags = nil} var expireTimer: UInt32 { - get {return _storage._expireTimer ?? 0} - set {_uniqueStorage()._expireTimer = newValue} + get {return _expireTimer ?? 0} + set {_expireTimer = newValue} } /// Returns true if `expireTimer` has been explicitly set. - var hasExpireTimer: Bool {return _storage._expireTimer != nil} + var hasExpireTimer: Bool {return self._expireTimer != nil} /// Clears the value of `expireTimer`. Subsequent reads from it will return its default value. - mutating func clearExpireTimer() {_uniqueStorage()._expireTimer = nil} + mutating func clearExpireTimer() {self._expireTimer = nil} var profileKey: Data { - get {return _storage._profileKey ?? SwiftProtobuf.Internal.emptyData} - set {_uniqueStorage()._profileKey = newValue} + get {return _profileKey ?? SwiftProtobuf.Internal.emptyData} + set {_profileKey = newValue} } /// Returns true if `profileKey` has been explicitly set. - var hasProfileKey: Bool {return _storage._profileKey != nil} + var hasProfileKey: Bool {return self._profileKey != nil} /// Clears the value of `profileKey`. Subsequent reads from it will return its default value. - mutating func clearProfileKey() {_uniqueStorage()._profileKey = nil} + mutating func clearProfileKey() {self._profileKey = nil} var timestamp: UInt64 { - get {return _storage._timestamp ?? 0} - set {_uniqueStorage()._timestamp = newValue} + get {return _timestamp ?? 0} + set {_timestamp = newValue} } /// Returns true if `timestamp` has been explicitly set. - var hasTimestamp: Bool {return _storage._timestamp != nil} + var hasTimestamp: Bool {return self._timestamp != nil} /// Clears the value of `timestamp`. Subsequent reads from it will return its default value. - mutating func clearTimestamp() {_uniqueStorage()._timestamp = nil} + mutating func clearTimestamp() {self._timestamp = nil} var quote: SignalServiceProtos_DataMessage.Quote { - get {return _storage._quote ?? SignalServiceProtos_DataMessage.Quote()} - set {_uniqueStorage()._quote = newValue} + get {return _quote ?? SignalServiceProtos_DataMessage.Quote()} + set {_quote = newValue} } /// Returns true if `quote` has been explicitly set. - var hasQuote: Bool {return _storage._quote != nil} + var hasQuote: Bool {return self._quote != nil} /// Clears the value of `quote`. Subsequent reads from it will return its default value. - mutating func clearQuote() {_uniqueStorage()._quote = nil} + mutating func clearQuote() {self._quote = nil} - var contact: [SignalServiceProtos_DataMessage.Contact] { - get {return _storage._contact} - set {_uniqueStorage()._contact = newValue} - } + var contact: [SignalServiceProtos_DataMessage.Contact] = [] - var preview: [SignalServiceProtos_DataMessage.Preview] { - get {return _storage._preview} - set {_uniqueStorage()._preview = newValue} - } + var preview: [SignalServiceProtos_DataMessage.Preview] = [] var sticker: SignalServiceProtos_DataMessage.Sticker { - get {return _storage._sticker ?? SignalServiceProtos_DataMessage.Sticker()} - set {_uniqueStorage()._sticker = newValue} + get {return _sticker ?? SignalServiceProtos_DataMessage.Sticker()} + set {_sticker = newValue} } /// Returns true if `sticker` has been explicitly set. - var hasSticker: Bool {return _storage._sticker != nil} + var hasSticker: Bool {return self._sticker != nil} /// Clears the value of `sticker`. Subsequent reads from it will return its default value. - mutating func clearSticker() {_uniqueStorage()._sticker = nil} + mutating func clearSticker() {self._sticker = nil} var requiredProtocolVersion: UInt32 { - get {return _storage._requiredProtocolVersion ?? 0} - set {_uniqueStorage()._requiredProtocolVersion = newValue} + get {return _requiredProtocolVersion ?? 0} + set {_requiredProtocolVersion = newValue} } /// Returns true if `requiredProtocolVersion` has been explicitly set. - var hasRequiredProtocolVersion: Bool {return _storage._requiredProtocolVersion != nil} + var hasRequiredProtocolVersion: Bool {return self._requiredProtocolVersion != nil} /// Clears the value of `requiredProtocolVersion`. Subsequent reads from it will return its default value. - mutating func clearRequiredProtocolVersion() {_uniqueStorage()._requiredProtocolVersion = nil} + mutating func clearRequiredProtocolVersion() {self._requiredProtocolVersion = nil} var isViewOnce: Bool { - get {return _storage._isViewOnce ?? false} - set {_uniqueStorage()._isViewOnce = newValue} + get {return _isViewOnce ?? false} + set {_isViewOnce = newValue} } /// Returns true if `isViewOnce` has been explicitly set. - var hasIsViewOnce: Bool {return _storage._isViewOnce != nil} + var hasIsViewOnce: Bool {return self._isViewOnce != nil} /// Clears the value of `isViewOnce`. Subsequent reads from it will return its default value. - mutating func clearIsViewOnce() {_uniqueStorage()._isViewOnce = nil} + mutating func clearIsViewOnce() {self._isViewOnce = nil} var reaction: SignalServiceProtos_DataMessage.Reaction { - get {return _storage._reaction ?? SignalServiceProtos_DataMessage.Reaction()} - set {_uniqueStorage()._reaction = newValue} + get {return _reaction ?? SignalServiceProtos_DataMessage.Reaction()} + set {_reaction = newValue} } /// Returns true if `reaction` has been explicitly set. - var hasReaction: Bool {return _storage._reaction != nil} + var hasReaction: Bool {return self._reaction != nil} /// Clears the value of `reaction`. Subsequent reads from it will return its default value. - mutating func clearReaction() {_uniqueStorage()._reaction = nil} + mutating func clearReaction() {self._reaction = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -807,40 +804,40 @@ struct SignalServiceProtos_DataMessage { // methods supported on all messages. var contentType: String { - get {return _storage._contentType ?? String()} - set {_uniqueStorage()._contentType = newValue} + get {return _contentType ?? String()} + set {_contentType = newValue} } /// Returns true if `contentType` has been explicitly set. - var hasContentType: Bool {return _storage._contentType != nil} + var hasContentType: Bool {return self._contentType != nil} /// Clears the value of `contentType`. Subsequent reads from it will return its default value. - mutating func clearContentType() {_uniqueStorage()._contentType = nil} + mutating func clearContentType() {self._contentType = nil} var fileName: String { - get {return _storage._fileName ?? String()} - set {_uniqueStorage()._fileName = newValue} + get {return _fileName ?? String()} + set {_fileName = newValue} } /// Returns true if `fileName` has been explicitly set. - var hasFileName: Bool {return _storage._fileName != nil} + var hasFileName: Bool {return self._fileName != nil} /// Clears the value of `fileName`. Subsequent reads from it will return its default value. - mutating func clearFileName() {_uniqueStorage()._fileName = nil} + mutating func clearFileName() {self._fileName = nil} var thumbnail: SignalServiceProtos_AttachmentPointer { - get {return _storage._thumbnail ?? SignalServiceProtos_AttachmentPointer()} - set {_uniqueStorage()._thumbnail = newValue} + get {return _thumbnail ?? SignalServiceProtos_AttachmentPointer()} + set {_thumbnail = newValue} } /// Returns true if `thumbnail` has been explicitly set. - var hasThumbnail: Bool {return _storage._thumbnail != nil} + var hasThumbnail: Bool {return self._thumbnail != nil} /// Clears the value of `thumbnail`. Subsequent reads from it will return its default value. - mutating func clearThumbnail() {_uniqueStorage()._thumbnail = nil} + mutating func clearThumbnail() {self._thumbnail = nil} var flags: UInt32 { - get {return _storage._flags ?? 0} - set {_uniqueStorage()._flags = newValue} + get {return _flags ?? 0} + set {_flags = newValue} } /// Returns true if `flags` has been explicitly set. - var hasFlags: Bool {return _storage._flags != nil} + var hasFlags: Bool {return self._flags != nil} /// Clears the value of `flags`. Subsequent reads from it will return its default value. - mutating func clearFlags() {_uniqueStorage()._flags = nil} + mutating func clearFlags() {self._flags = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -869,7 +866,10 @@ struct SignalServiceProtos_DataMessage { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _contentType: String? + fileprivate var _fileName: String? + fileprivate var _thumbnail: SignalServiceProtos_AttachmentPointer? + fileprivate var _flags: UInt32? } init() {} @@ -886,46 +886,37 @@ struct SignalServiceProtos_DataMessage { // methods supported on all messages. var name: SignalServiceProtos_DataMessage.Contact.Name { - get {return _storage._name ?? SignalServiceProtos_DataMessage.Contact.Name()} - set {_uniqueStorage()._name = newValue} + get {return _name ?? SignalServiceProtos_DataMessage.Contact.Name()} + set {_name = newValue} } /// Returns true if `name` has been explicitly set. - var hasName: Bool {return _storage._name != nil} + var hasName: Bool {return self._name != nil} /// Clears the value of `name`. Subsequent reads from it will return its default value. - mutating func clearName() {_uniqueStorage()._name = nil} + mutating func clearName() {self._name = nil} - var number: [SignalServiceProtos_DataMessage.Contact.Phone] { - get {return _storage._number} - set {_uniqueStorage()._number = newValue} - } + var number: [SignalServiceProtos_DataMessage.Contact.Phone] = [] - var email: [SignalServiceProtos_DataMessage.Contact.Email] { - get {return _storage._email} - set {_uniqueStorage()._email = newValue} - } + var email: [SignalServiceProtos_DataMessage.Contact.Email] = [] - var address: [SignalServiceProtos_DataMessage.Contact.PostalAddress] { - get {return _storage._address} - set {_uniqueStorage()._address = newValue} - } + var address: [SignalServiceProtos_DataMessage.Contact.PostalAddress] = [] var avatar: SignalServiceProtos_DataMessage.Contact.Avatar { - get {return _storage._avatar ?? SignalServiceProtos_DataMessage.Contact.Avatar()} - set {_uniqueStorage()._avatar = newValue} + get {return _avatar ?? SignalServiceProtos_DataMessage.Contact.Avatar()} + set {_avatar = newValue} } /// Returns true if `avatar` has been explicitly set. - var hasAvatar: Bool {return _storage._avatar != nil} + var hasAvatar: Bool {return self._avatar != nil} /// Clears the value of `avatar`. Subsequent reads from it will return its default value. - mutating func clearAvatar() {_uniqueStorage()._avatar = nil} + mutating func clearAvatar() {self._avatar = nil} var organization: String { - get {return _storage._organization ?? String()} - set {_uniqueStorage()._organization = newValue} + get {return _organization ?? String()} + set {_organization = newValue} } /// Returns true if `organization` has been explicitly set. - var hasOrganization: Bool {return _storage._organization != nil} + var hasOrganization: Bool {return self._organization != nil} /// Clears the value of `organization`. Subsequent reads from it will return its default value. - mutating func clearOrganization() {_uniqueStorage()._organization = nil} + mutating func clearOrganization() {self._organization = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -1282,33 +1273,36 @@ struct SignalServiceProtos_DataMessage { // methods supported on all messages. var avatar: SignalServiceProtos_AttachmentPointer { - get {return _storage._avatar ?? SignalServiceProtos_AttachmentPointer()} - set {_uniqueStorage()._avatar = newValue} + get {return _avatar ?? SignalServiceProtos_AttachmentPointer()} + set {_avatar = newValue} } /// Returns true if `avatar` has been explicitly set. - var hasAvatar: Bool {return _storage._avatar != nil} + var hasAvatar: Bool {return self._avatar != nil} /// Clears the value of `avatar`. Subsequent reads from it will return its default value. - mutating func clearAvatar() {_uniqueStorage()._avatar = nil} + mutating func clearAvatar() {self._avatar = nil} var isProfile: Bool { - get {return _storage._isProfile ?? false} - set {_uniqueStorage()._isProfile = newValue} + get {return _isProfile ?? false} + set {_isProfile = newValue} } /// Returns true if `isProfile` has been explicitly set. - var hasIsProfile: Bool {return _storage._isProfile != nil} + var hasIsProfile: Bool {return self._isProfile != nil} /// Clears the value of `isProfile`. Subsequent reads from it will return its default value. - mutating func clearIsProfile() {_uniqueStorage()._isProfile = nil} + mutating func clearIsProfile() {self._isProfile = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _avatar: SignalServiceProtos_AttachmentPointer? + fileprivate var _isProfile: Bool? } init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _name: SignalServiceProtos_DataMessage.Contact.Name? + fileprivate var _avatar: SignalServiceProtos_DataMessage.Contact.Avatar? + fileprivate var _organization: String? } struct Preview { @@ -1318,37 +1312,39 @@ struct SignalServiceProtos_DataMessage { /// @required var url: String { - get {return _storage._url ?? String()} - set {_uniqueStorage()._url = newValue} + get {return _url ?? String()} + set {_url = newValue} } /// Returns true if `url` has been explicitly set. - var hasURL: Bool {return _storage._url != nil} + var hasURL: Bool {return self._url != nil} /// Clears the value of `url`. Subsequent reads from it will return its default value. - mutating func clearURL() {_uniqueStorage()._url = nil} + mutating func clearURL() {self._url = nil} var title: String { - get {return _storage._title ?? String()} - set {_uniqueStorage()._title = newValue} + get {return _title ?? String()} + set {_title = newValue} } /// Returns true if `title` has been explicitly set. - var hasTitle: Bool {return _storage._title != nil} + var hasTitle: Bool {return self._title != nil} /// Clears the value of `title`. Subsequent reads from it will return its default value. - mutating func clearTitle() {_uniqueStorage()._title = nil} + mutating func clearTitle() {self._title = nil} var image: SignalServiceProtos_AttachmentPointer { - get {return _storage._image ?? SignalServiceProtos_AttachmentPointer()} - set {_uniqueStorage()._image = newValue} + get {return _image ?? SignalServiceProtos_AttachmentPointer()} + set {_image = newValue} } /// Returns true if `image` has been explicitly set. - var hasImage: Bool {return _storage._image != nil} + var hasImage: Bool {return self._image != nil} /// Clears the value of `image`. Subsequent reads from it will return its default value. - mutating func clearImage() {_uniqueStorage()._image = nil} + mutating func clearImage() {self._image = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _url: String? + fileprivate var _title: String? + fileprivate var _image: SignalServiceProtos_AttachmentPointer? } struct Sticker { @@ -1358,49 +1354,52 @@ struct SignalServiceProtos_DataMessage { /// @required var packID: Data { - get {return _storage._packID ?? SwiftProtobuf.Internal.emptyData} - set {_uniqueStorage()._packID = newValue} + get {return _packID ?? SwiftProtobuf.Internal.emptyData} + set {_packID = newValue} } /// Returns true if `packID` has been explicitly set. - var hasPackID: Bool {return _storage._packID != nil} + var hasPackID: Bool {return self._packID != nil} /// Clears the value of `packID`. Subsequent reads from it will return its default value. - mutating func clearPackID() {_uniqueStorage()._packID = nil} + mutating func clearPackID() {self._packID = nil} /// @required var packKey: Data { - get {return _storage._packKey ?? SwiftProtobuf.Internal.emptyData} - set {_uniqueStorage()._packKey = newValue} + get {return _packKey ?? SwiftProtobuf.Internal.emptyData} + set {_packKey = newValue} } /// Returns true if `packKey` has been explicitly set. - var hasPackKey: Bool {return _storage._packKey != nil} + var hasPackKey: Bool {return self._packKey != nil} /// Clears the value of `packKey`. Subsequent reads from it will return its default value. - mutating func clearPackKey() {_uniqueStorage()._packKey = nil} + mutating func clearPackKey() {self._packKey = nil} /// @required var stickerID: UInt32 { - get {return _storage._stickerID ?? 0} - set {_uniqueStorage()._stickerID = newValue} + get {return _stickerID ?? 0} + set {_stickerID = newValue} } /// Returns true if `stickerID` has been explicitly set. - var hasStickerID: Bool {return _storage._stickerID != nil} + var hasStickerID: Bool {return self._stickerID != nil} /// Clears the value of `stickerID`. Subsequent reads from it will return its default value. - mutating func clearStickerID() {_uniqueStorage()._stickerID = nil} + mutating func clearStickerID() {self._stickerID = nil} /// @required var data: SignalServiceProtos_AttachmentPointer { - get {return _storage._data ?? SignalServiceProtos_AttachmentPointer()} - set {_uniqueStorage()._data = newValue} + get {return _data ?? SignalServiceProtos_AttachmentPointer()} + set {_data = newValue} } /// Returns true if `data` has been explicitly set. - var hasData: Bool {return _storage._data != nil} + var hasData: Bool {return self._data != nil} /// Clears the value of `data`. Subsequent reads from it will return its default value. - mutating func clearData() {_uniqueStorage()._data = nil} + mutating func clearData() {self._data = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _packID: Data? + fileprivate var _packKey: Data? + fileprivate var _stickerID: UInt32? + fileprivate var _data: SignalServiceProtos_AttachmentPointer? } struct Reaction { @@ -1469,7 +1468,18 @@ struct SignalServiceProtos_DataMessage { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _body: String? + fileprivate var _group: SignalServiceProtos_GroupContext? + fileprivate var _groupV2: SignalServiceProtos_GroupContextV2? + fileprivate var _flags: UInt32? + fileprivate var _expireTimer: UInt32? + fileprivate var _profileKey: Data? + fileprivate var _timestamp: UInt64? + fileprivate var _quote: SignalServiceProtos_DataMessage.Quote? + fileprivate var _sticker: SignalServiceProtos_DataMessage.Sticker? + fileprivate var _requiredProtocolVersion: UInt32? + fileprivate var _isViewOnce: Bool? + fileprivate var _reaction: SignalServiceProtos_DataMessage.Reaction? } #if swift(>=4.2) @@ -1482,6 +1492,22 @@ extension SignalServiceProtos_DataMessage.ProtocolVersion: CaseIterable { // Support synthesized by the compiler. } +extension SignalServiceProtos_DataMessage.Quote.QuotedAttachment.Flags: CaseIterable { + // Support synthesized by the compiler. +} + +extension SignalServiceProtos_DataMessage.Contact.Phone.TypeEnum: CaseIterable { + // Support synthesized by the compiler. +} + +extension SignalServiceProtos_DataMessage.Contact.Email.TypeEnum: CaseIterable { + // Support synthesized by the compiler. +} + +extension SignalServiceProtos_DataMessage.Contact.PostalAddress.TypeEnum: CaseIterable { + // Support synthesized by the compiler. +} + #endif // swift(>=4.2) struct SignalServiceProtos_NullMessage { @@ -1666,122 +1692,116 @@ struct SignalServiceProtos_SyncMessage { // methods supported on all messages. var sent: SignalServiceProtos_SyncMessage.Sent { - get {return _storage._sent ?? SignalServiceProtos_SyncMessage.Sent()} - set {_uniqueStorage()._sent = newValue} + get {return _sent ?? SignalServiceProtos_SyncMessage.Sent()} + set {_sent = newValue} } /// Returns true if `sent` has been explicitly set. - var hasSent: Bool {return _storage._sent != nil} + var hasSent: Bool {return self._sent != nil} /// Clears the value of `sent`. Subsequent reads from it will return its default value. - mutating func clearSent() {_uniqueStorage()._sent = nil} + mutating func clearSent() {self._sent = nil} var contacts: SignalServiceProtos_SyncMessage.Contacts { - get {return _storage._contacts ?? SignalServiceProtos_SyncMessage.Contacts()} - set {_uniqueStorage()._contacts = newValue} + get {return _contacts ?? SignalServiceProtos_SyncMessage.Contacts()} + set {_contacts = newValue} } /// Returns true if `contacts` has been explicitly set. - var hasContacts: Bool {return _storage._contacts != nil} + var hasContacts: Bool {return self._contacts != nil} /// Clears the value of `contacts`. Subsequent reads from it will return its default value. - mutating func clearContacts() {_uniqueStorage()._contacts = nil} + mutating func clearContacts() {self._contacts = nil} var groups: SignalServiceProtos_SyncMessage.Groups { - get {return _storage._groups ?? SignalServiceProtos_SyncMessage.Groups()} - set {_uniqueStorage()._groups = newValue} + get {return _groups ?? SignalServiceProtos_SyncMessage.Groups()} + set {_groups = newValue} } /// Returns true if `groups` has been explicitly set. - var hasGroups: Bool {return _storage._groups != nil} + var hasGroups: Bool {return self._groups != nil} /// Clears the value of `groups`. Subsequent reads from it will return its default value. - mutating func clearGroups() {_uniqueStorage()._groups = nil} + mutating func clearGroups() {self._groups = nil} var request: SignalServiceProtos_SyncMessage.Request { - get {return _storage._request ?? SignalServiceProtos_SyncMessage.Request()} - set {_uniqueStorage()._request = newValue} + get {return _request ?? SignalServiceProtos_SyncMessage.Request()} + set {_request = newValue} } /// Returns true if `request` has been explicitly set. - var hasRequest: Bool {return _storage._request != nil} + var hasRequest: Bool {return self._request != nil} /// Clears the value of `request`. Subsequent reads from it will return its default value. - mutating func clearRequest() {_uniqueStorage()._request = nil} + mutating func clearRequest() {self._request = nil} - var read: [SignalServiceProtos_SyncMessage.Read] { - get {return _storage._read} - set {_uniqueStorage()._read = newValue} - } + var read: [SignalServiceProtos_SyncMessage.Read] = [] var blocked: SignalServiceProtos_SyncMessage.Blocked { - get {return _storage._blocked ?? SignalServiceProtos_SyncMessage.Blocked()} - set {_uniqueStorage()._blocked = newValue} + get {return _blocked ?? SignalServiceProtos_SyncMessage.Blocked()} + set {_blocked = newValue} } /// Returns true if `blocked` has been explicitly set. - var hasBlocked: Bool {return _storage._blocked != nil} + var hasBlocked: Bool {return self._blocked != nil} /// Clears the value of `blocked`. Subsequent reads from it will return its default value. - mutating func clearBlocked() {_uniqueStorage()._blocked = nil} + mutating func clearBlocked() {self._blocked = nil} var verified: SignalServiceProtos_Verified { - get {return _storage._verified ?? SignalServiceProtos_Verified()} - set {_uniqueStorage()._verified = newValue} + get {return _verified ?? SignalServiceProtos_Verified()} + set {_verified = newValue} } /// Returns true if `verified` has been explicitly set. - var hasVerified: Bool {return _storage._verified != nil} + var hasVerified: Bool {return self._verified != nil} /// Clears the value of `verified`. Subsequent reads from it will return its default value. - mutating func clearVerified() {_uniqueStorage()._verified = nil} + mutating func clearVerified() {self._verified = nil} var configuration: SignalServiceProtos_SyncMessage.Configuration { - get {return _storage._configuration ?? SignalServiceProtos_SyncMessage.Configuration()} - set {_uniqueStorage()._configuration = newValue} + get {return _configuration ?? SignalServiceProtos_SyncMessage.Configuration()} + set {_configuration = newValue} } /// Returns true if `configuration` has been explicitly set. - var hasConfiguration: Bool {return _storage._configuration != nil} + var hasConfiguration: Bool {return self._configuration != nil} /// Clears the value of `configuration`. Subsequent reads from it will return its default value. - mutating func clearConfiguration() {_uniqueStorage()._configuration = nil} + mutating func clearConfiguration() {self._configuration = nil} var padding: Data { - get {return _storage._padding ?? SwiftProtobuf.Internal.emptyData} - set {_uniqueStorage()._padding = newValue} + get {return _padding ?? SwiftProtobuf.Internal.emptyData} + set {_padding = newValue} } /// Returns true if `padding` has been explicitly set. - var hasPadding: Bool {return _storage._padding != nil} + var hasPadding: Bool {return self._padding != nil} /// Clears the value of `padding`. Subsequent reads from it will return its default value. - mutating func clearPadding() {_uniqueStorage()._padding = nil} + mutating func clearPadding() {self._padding = nil} - var stickerPackOperation: [SignalServiceProtos_SyncMessage.StickerPackOperation] { - get {return _storage._stickerPackOperation} - set {_uniqueStorage()._stickerPackOperation = newValue} - } + var stickerPackOperation: [SignalServiceProtos_SyncMessage.StickerPackOperation] = [] var viewOnceOpen: SignalServiceProtos_SyncMessage.ViewOnceOpen { - get {return _storage._viewOnceOpen ?? SignalServiceProtos_SyncMessage.ViewOnceOpen()} - set {_uniqueStorage()._viewOnceOpen = newValue} + get {return _viewOnceOpen ?? SignalServiceProtos_SyncMessage.ViewOnceOpen()} + set {_viewOnceOpen = newValue} } /// Returns true if `viewOnceOpen` has been explicitly set. - var hasViewOnceOpen: Bool {return _storage._viewOnceOpen != nil} + var hasViewOnceOpen: Bool {return self._viewOnceOpen != nil} /// Clears the value of `viewOnceOpen`. Subsequent reads from it will return its default value. - mutating func clearViewOnceOpen() {_uniqueStorage()._viewOnceOpen = nil} + mutating func clearViewOnceOpen() {self._viewOnceOpen = nil} var fetchLatest: SignalServiceProtos_SyncMessage.FetchLatest { - get {return _storage._fetchLatest ?? SignalServiceProtos_SyncMessage.FetchLatest()} - set {_uniqueStorage()._fetchLatest = newValue} + get {return _fetchLatest ?? SignalServiceProtos_SyncMessage.FetchLatest()} + set {_fetchLatest = newValue} } /// Returns true if `fetchLatest` has been explicitly set. - var hasFetchLatest: Bool {return _storage._fetchLatest != nil} + var hasFetchLatest: Bool {return self._fetchLatest != nil} /// Clears the value of `fetchLatest`. Subsequent reads from it will return its default value. - mutating func clearFetchLatest() {_uniqueStorage()._fetchLatest = nil} + mutating func clearFetchLatest() {self._fetchLatest = nil} var keys: SignalServiceProtos_SyncMessage.Keys { - get {return _storage._keys ?? SignalServiceProtos_SyncMessage.Keys()} - set {_uniqueStorage()._keys = newValue} + get {return _keys ?? SignalServiceProtos_SyncMessage.Keys()} + set {_keys = newValue} } /// Returns true if `keys` has been explicitly set. - var hasKeys: Bool {return _storage._keys != nil} + var hasKeys: Bool {return self._keys != nil} /// Clears the value of `keys`. Subsequent reads from it will return its default value. - mutating func clearKeys() {_uniqueStorage()._keys = nil} + mutating func clearKeys() {self._keys = nil} var messageRequestResponse: SignalServiceProtos_SyncMessage.MessageRequestResponse { - get {return _storage._messageRequestResponse ?? SignalServiceProtos_SyncMessage.MessageRequestResponse()} - set {_uniqueStorage()._messageRequestResponse = newValue} + get {return _messageRequestResponse ?? SignalServiceProtos_SyncMessage.MessageRequestResponse()} + set {_messageRequestResponse = newValue} } /// Returns true if `messageRequestResponse` has been explicitly set. - var hasMessageRequestResponse: Bool {return _storage._messageRequestResponse != nil} + var hasMessageRequestResponse: Bool {return self._messageRequestResponse != nil} /// Clears the value of `messageRequestResponse`. Subsequent reads from it will return its default value. - mutating func clearMessageRequestResponse() {_uniqueStorage()._messageRequestResponse = nil} + mutating func clearMessageRequestResponse() {self._messageRequestResponse = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -1791,63 +1811,60 @@ struct SignalServiceProtos_SyncMessage { // methods supported on all messages. var destinationE164: String { - get {return _storage._destinationE164 ?? String()} - set {_uniqueStorage()._destinationE164 = newValue} + get {return _destinationE164 ?? String()} + set {_destinationE164 = newValue} } /// Returns true if `destinationE164` has been explicitly set. - var hasDestinationE164: Bool {return _storage._destinationE164 != nil} + var hasDestinationE164: Bool {return self._destinationE164 != nil} /// Clears the value of `destinationE164`. Subsequent reads from it will return its default value. - mutating func clearDestinationE164() {_uniqueStorage()._destinationE164 = nil} + mutating func clearDestinationE164() {self._destinationE164 = nil} var destinationUuid: String { - get {return _storage._destinationUuid ?? String()} - set {_uniqueStorage()._destinationUuid = newValue} + get {return _destinationUuid ?? String()} + set {_destinationUuid = newValue} } /// Returns true if `destinationUuid` has been explicitly set. - var hasDestinationUuid: Bool {return _storage._destinationUuid != nil} + var hasDestinationUuid: Bool {return self._destinationUuid != nil} /// Clears the value of `destinationUuid`. Subsequent reads from it will return its default value. - mutating func clearDestinationUuid() {_uniqueStorage()._destinationUuid = nil} + mutating func clearDestinationUuid() {self._destinationUuid = nil} var timestamp: UInt64 { - get {return _storage._timestamp ?? 0} - set {_uniqueStorage()._timestamp = newValue} + get {return _timestamp ?? 0} + set {_timestamp = newValue} } /// Returns true if `timestamp` has been explicitly set. - var hasTimestamp: Bool {return _storage._timestamp != nil} + var hasTimestamp: Bool {return self._timestamp != nil} /// Clears the value of `timestamp`. Subsequent reads from it will return its default value. - mutating func clearTimestamp() {_uniqueStorage()._timestamp = nil} + mutating func clearTimestamp() {self._timestamp = nil} var message: SignalServiceProtos_DataMessage { - get {return _storage._message ?? SignalServiceProtos_DataMessage()} - set {_uniqueStorage()._message = newValue} + get {return _message ?? SignalServiceProtos_DataMessage()} + set {_message = newValue} } /// Returns true if `message` has been explicitly set. - var hasMessage: Bool {return _storage._message != nil} + var hasMessage: Bool {return self._message != nil} /// Clears the value of `message`. Subsequent reads from it will return its default value. - mutating func clearMessage() {_uniqueStorage()._message = nil} + mutating func clearMessage() {self._message = nil} var expirationStartTimestamp: UInt64 { - get {return _storage._expirationStartTimestamp ?? 0} - set {_uniqueStorage()._expirationStartTimestamp = newValue} + get {return _expirationStartTimestamp ?? 0} + set {_expirationStartTimestamp = newValue} } /// Returns true if `expirationStartTimestamp` has been explicitly set. - var hasExpirationStartTimestamp: Bool {return _storage._expirationStartTimestamp != nil} + var hasExpirationStartTimestamp: Bool {return self._expirationStartTimestamp != nil} /// Clears the value of `expirationStartTimestamp`. Subsequent reads from it will return its default value. - mutating func clearExpirationStartTimestamp() {_uniqueStorage()._expirationStartTimestamp = nil} + mutating func clearExpirationStartTimestamp() {self._expirationStartTimestamp = nil} - var unidentifiedStatus: [SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus] { - get {return _storage._unidentifiedStatus} - set {_uniqueStorage()._unidentifiedStatus = newValue} - } + var unidentifiedStatus: [SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus] = [] var isRecipientUpdate: Bool { - get {return _storage._isRecipientUpdate ?? false} - set {_uniqueStorage()._isRecipientUpdate = newValue} + get {return _isRecipientUpdate ?? false} + set {_isRecipientUpdate = newValue} } /// Returns true if `isRecipientUpdate` has been explicitly set. - var hasIsRecipientUpdate: Bool {return _storage._isRecipientUpdate != nil} + var hasIsRecipientUpdate: Bool {return self._isRecipientUpdate != nil} /// Clears the value of `isRecipientUpdate`. Subsequent reads from it will return its default value. - mutating func clearIsRecipientUpdate() {_uniqueStorage()._isRecipientUpdate = nil} + mutating func clearIsRecipientUpdate() {self._isRecipientUpdate = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -1894,7 +1911,12 @@ struct SignalServiceProtos_SyncMessage { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _destinationE164: String? + fileprivate var _destinationUuid: String? + fileprivate var _timestamp: UInt64? + fileprivate var _message: SignalServiceProtos_DataMessage? + fileprivate var _expirationStartTimestamp: UInt64? + fileprivate var _isRecipientUpdate: Bool? } struct Contacts { @@ -1904,29 +1926,30 @@ struct SignalServiceProtos_SyncMessage { /// @required var blob: SignalServiceProtos_AttachmentPointer { - get {return _storage._blob ?? SignalServiceProtos_AttachmentPointer()} - set {_uniqueStorage()._blob = newValue} + get {return _blob ?? SignalServiceProtos_AttachmentPointer()} + set {_blob = newValue} } /// Returns true if `blob` has been explicitly set. - var hasBlob: Bool {return _storage._blob != nil} + var hasBlob: Bool {return self._blob != nil} /// Clears the value of `blob`. Subsequent reads from it will return its default value. - mutating func clearBlob() {_uniqueStorage()._blob = nil} + mutating func clearBlob() {self._blob = nil} /// Signal-iOS renamed this property. var isComplete: Bool { - get {return _storage._isComplete ?? false} - set {_uniqueStorage()._isComplete = newValue} + get {return _isComplete ?? false} + set {_isComplete = newValue} } /// Returns true if `isComplete` has been explicitly set. - var hasIsComplete: Bool {return _storage._isComplete != nil} + var hasIsComplete: Bool {return self._isComplete != nil} /// Clears the value of `isComplete`. Subsequent reads from it will return its default value. - mutating func clearIsComplete() {_uniqueStorage()._isComplete = nil} + mutating func clearIsComplete() {self._isComplete = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _blob: SignalServiceProtos_AttachmentPointer? + fileprivate var _isComplete: Bool? } struct Groups { @@ -1935,19 +1958,19 @@ struct SignalServiceProtos_SyncMessage { // methods supported on all messages. var blob: SignalServiceProtos_AttachmentPointer { - get {return _storage._blob ?? SignalServiceProtos_AttachmentPointer()} - set {_uniqueStorage()._blob = newValue} + get {return _blob ?? SignalServiceProtos_AttachmentPointer()} + set {_blob = newValue} } /// Returns true if `blob` has been explicitly set. - var hasBlob: Bool {return _storage._blob != nil} + var hasBlob: Bool {return self._blob != nil} /// Clears the value of `blob`. Subsequent reads from it will return its default value. - mutating func clearBlob() {_uniqueStorage()._blob = nil} + mutating func clearBlob() {self._blob = nil} var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _blob: SignalServiceProtos_AttachmentPointer? } struct Blocked { @@ -2398,9 +2421,40 @@ struct SignalServiceProtos_SyncMessage { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _sent: SignalServiceProtos_SyncMessage.Sent? + fileprivate var _contacts: SignalServiceProtos_SyncMessage.Contacts? + fileprivate var _groups: SignalServiceProtos_SyncMessage.Groups? + fileprivate var _request: SignalServiceProtos_SyncMessage.Request? + fileprivate var _blocked: SignalServiceProtos_SyncMessage.Blocked? + fileprivate var _verified: SignalServiceProtos_Verified? + fileprivate var _configuration: SignalServiceProtos_SyncMessage.Configuration? + fileprivate var _padding: Data? + fileprivate var _viewOnceOpen: SignalServiceProtos_SyncMessage.ViewOnceOpen? + fileprivate var _fetchLatest: SignalServiceProtos_SyncMessage.FetchLatest? + fileprivate var _keys: SignalServiceProtos_SyncMessage.Keys? + fileprivate var _messageRequestResponse: SignalServiceProtos_SyncMessage.MessageRequestResponse? } +#if swift(>=4.2) + +extension SignalServiceProtos_SyncMessage.Request.TypeEnum: CaseIterable { + // Support synthesized by the compiler. +} + +extension SignalServiceProtos_SyncMessage.StickerPackOperation.TypeEnum: CaseIterable { + // Support synthesized by the compiler. +} + +extension SignalServiceProtos_SyncMessage.FetchLatest.TypeEnum: CaseIterable { + // Support synthesized by the compiler. +} + +extension SignalServiceProtos_SyncMessage.MessageRequestResponse.TypeEnum: CaseIterable { + // Support synthesized by the compiler. +} + +#endif // swift(>=4.2) + struct SignalServiceProtos_AttachmentPointer { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for @@ -2515,6 +2569,15 @@ struct SignalServiceProtos_AttachmentPointer { /// Clears the value of `blurHash`. Subsequent reads from it will return its default value. mutating func clearBlurHash() {self._blurHash = nil} + var uploadTimestamp: UInt64 { + get {return _uploadTimestamp ?? 0} + set {_uploadTimestamp = newValue} + } + /// Returns true if `uploadTimestamp` has been explicitly set. + var hasUploadTimestamp: Bool {return self._uploadTimestamp != nil} + /// Clears the value of `uploadTimestamp`. Subsequent reads from it will return its default value. + mutating func clearUploadTimestamp() {self._uploadTimestamp = nil} + var unknownFields = SwiftProtobuf.UnknownStorage() enum Flags: SwiftProtobuf.Enum { @@ -2554,6 +2617,7 @@ struct SignalServiceProtos_AttachmentPointer { fileprivate var _height: UInt32? fileprivate var _caption: String? fileprivate var _blurHash: String? + fileprivate var _uploadTimestamp: UInt64? } #if swift(>=4.2) @@ -2571,53 +2635,47 @@ struct SignalServiceProtos_GroupContext { /// @required var id: Data { - get {return _storage._id ?? SwiftProtobuf.Internal.emptyData} - set {_uniqueStorage()._id = newValue} + get {return _id ?? SwiftProtobuf.Internal.emptyData} + set {_id = newValue} } /// Returns true if `id` has been explicitly set. - var hasID: Bool {return _storage._id != nil} + var hasID: Bool {return self._id != nil} /// Clears the value of `id`. Subsequent reads from it will return its default value. - mutating func clearID() {_uniqueStorage()._id = nil} + mutating func clearID() {self._id = nil} var type: SignalServiceProtos_GroupContext.TypeEnum { - get {return _storage._type ?? .unknown} - set {_uniqueStorage()._type = newValue} + get {return _type ?? .unknown} + set {_type = newValue} } /// Returns true if `type` has been explicitly set. - var hasType: Bool {return _storage._type != nil} + var hasType: Bool {return self._type != nil} /// Clears the value of `type`. Subsequent reads from it will return its default value. - mutating func clearType() {_uniqueStorage()._type = nil} + mutating func clearType() {self._type = nil} var name: String { - get {return _storage._name ?? String()} - set {_uniqueStorage()._name = newValue} + get {return _name ?? String()} + set {_name = newValue} } /// Returns true if `name` has been explicitly set. - var hasName: Bool {return _storage._name != nil} + var hasName: Bool {return self._name != nil} /// Clears the value of `name`. Subsequent reads from it will return its default value. - mutating func clearName() {_uniqueStorage()._name = nil} + mutating func clearName() {self._name = nil} /// A list of known phone numbers in the group, only maintained /// to support legacy apps that don't know about UUIDs. We may want /// to eventually stop populating this. - var membersE164: [String] { - get {return _storage._membersE164} - set {_uniqueStorage()._membersE164 = newValue} - } + var membersE164: [String] = [] var avatar: SignalServiceProtos_AttachmentPointer { - get {return _storage._avatar ?? SignalServiceProtos_AttachmentPointer()} - set {_uniqueStorage()._avatar = newValue} + get {return _avatar ?? SignalServiceProtos_AttachmentPointer()} + set {_avatar = newValue} } /// Returns true if `avatar` has been explicitly set. - var hasAvatar: Bool {return _storage._avatar != nil} + var hasAvatar: Bool {return self._avatar != nil} /// Clears the value of `avatar`. Subsequent reads from it will return its default value. - mutating func clearAvatar() {_uniqueStorage()._avatar = nil} + mutating func clearAvatar() {self._avatar = nil} - var members: [SignalServiceProtos_GroupContext.Member] { - get {return _storage._members} - set {_uniqueStorage()._members = newValue} - } + var members: [SignalServiceProtos_GroupContext.Member] = [] var unknownFields = SwiftProtobuf.UnknownStorage() @@ -2689,7 +2747,10 @@ struct SignalServiceProtos_GroupContext { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _id: Data? + fileprivate var _type: SignalServiceProtos_GroupContext.TypeEnum? + fileprivate var _name: String? + fileprivate var _avatar: SignalServiceProtos_AttachmentPointer? } #if swift(>=4.2) @@ -2747,103 +2808,103 @@ struct SignalServiceProtos_ContactDetails { // methods supported on all messages. var number: String { - get {return _storage._number ?? String()} - set {_uniqueStorage()._number = newValue} + get {return _number ?? String()} + set {_number = newValue} } /// Returns true if `number` has been explicitly set. - var hasNumber: Bool {return _storage._number != nil} + var hasNumber: Bool {return self._number != nil} /// Clears the value of `number`. Subsequent reads from it will return its default value. - mutating func clearNumber() {_uniqueStorage()._number = nil} + mutating func clearNumber() {self._number = nil} var uuid: String { - get {return _storage._uuid ?? String()} - set {_uniqueStorage()._uuid = newValue} + get {return _uuid ?? String()} + set {_uuid = newValue} } /// Returns true if `uuid` has been explicitly set. - var hasUuid: Bool {return _storage._uuid != nil} + var hasUuid: Bool {return self._uuid != nil} /// Clears the value of `uuid`. Subsequent reads from it will return its default value. - mutating func clearUuid() {_uniqueStorage()._uuid = nil} + mutating func clearUuid() {self._uuid = nil} var name: String { - get {return _storage._name ?? String()} - set {_uniqueStorage()._name = newValue} + get {return _name ?? String()} + set {_name = newValue} } /// Returns true if `name` has been explicitly set. - var hasName: Bool {return _storage._name != nil} + var hasName: Bool {return self._name != nil} /// Clears the value of `name`. Subsequent reads from it will return its default value. - mutating func clearName() {_uniqueStorage()._name = nil} + mutating func clearName() {self._name = nil} var avatar: SignalServiceProtos_ContactDetails.Avatar { - get {return _storage._avatar ?? SignalServiceProtos_ContactDetails.Avatar()} - set {_uniqueStorage()._avatar = newValue} + get {return _avatar ?? SignalServiceProtos_ContactDetails.Avatar()} + set {_avatar = newValue} } /// Returns true if `avatar` has been explicitly set. - var hasAvatar: Bool {return _storage._avatar != nil} + var hasAvatar: Bool {return self._avatar != nil} /// Clears the value of `avatar`. Subsequent reads from it will return its default value. - mutating func clearAvatar() {_uniqueStorage()._avatar = nil} + mutating func clearAvatar() {self._avatar = nil} var color: String { - get {return _storage._color ?? String()} - set {_uniqueStorage()._color = newValue} + get {return _color ?? String()} + set {_color = newValue} } /// Returns true if `color` has been explicitly set. - var hasColor: Bool {return _storage._color != nil} + var hasColor: Bool {return self._color != nil} /// Clears the value of `color`. Subsequent reads from it will return its default value. - mutating func clearColor() {_uniqueStorage()._color = nil} + mutating func clearColor() {self._color = nil} var verified: SignalServiceProtos_Verified { - get {return _storage._verified ?? SignalServiceProtos_Verified()} - set {_uniqueStorage()._verified = newValue} + get {return _verified ?? SignalServiceProtos_Verified()} + set {_verified = newValue} } /// Returns true if `verified` has been explicitly set. - var hasVerified: Bool {return _storage._verified != nil} + var hasVerified: Bool {return self._verified != nil} /// Clears the value of `verified`. Subsequent reads from it will return its default value. - mutating func clearVerified() {_uniqueStorage()._verified = nil} + mutating func clearVerified() {self._verified = nil} var profileKey: Data { - get {return _storage._profileKey ?? SwiftProtobuf.Internal.emptyData} - set {_uniqueStorage()._profileKey = newValue} + get {return _profileKey ?? SwiftProtobuf.Internal.emptyData} + set {_profileKey = newValue} } /// Returns true if `profileKey` has been explicitly set. - var hasProfileKey: Bool {return _storage._profileKey != nil} + var hasProfileKey: Bool {return self._profileKey != nil} /// Clears the value of `profileKey`. Subsequent reads from it will return its default value. - mutating func clearProfileKey() {_uniqueStorage()._profileKey = nil} + mutating func clearProfileKey() {self._profileKey = nil} var blocked: Bool { - get {return _storage._blocked ?? false} - set {_uniqueStorage()._blocked = newValue} + get {return _blocked ?? false} + set {_blocked = newValue} } /// Returns true if `blocked` has been explicitly set. - var hasBlocked: Bool {return _storage._blocked != nil} + var hasBlocked: Bool {return self._blocked != nil} /// Clears the value of `blocked`. Subsequent reads from it will return its default value. - mutating func clearBlocked() {_uniqueStorage()._blocked = nil} + mutating func clearBlocked() {self._blocked = nil} var expireTimer: UInt32 { - get {return _storage._expireTimer ?? 0} - set {_uniqueStorage()._expireTimer = newValue} + get {return _expireTimer ?? 0} + set {_expireTimer = newValue} } /// Returns true if `expireTimer` has been explicitly set. - var hasExpireTimer: Bool {return _storage._expireTimer != nil} + var hasExpireTimer: Bool {return self._expireTimer != nil} /// Clears the value of `expireTimer`. Subsequent reads from it will return its default value. - mutating func clearExpireTimer() {_uniqueStorage()._expireTimer = nil} + mutating func clearExpireTimer() {self._expireTimer = nil} var inboxPosition: UInt32 { - get {return _storage._inboxPosition ?? 0} - set {_uniqueStorage()._inboxPosition = newValue} + get {return _inboxPosition ?? 0} + set {_inboxPosition = newValue} } /// Returns true if `inboxPosition` has been explicitly set. - var hasInboxPosition: Bool {return _storage._inboxPosition != nil} + var hasInboxPosition: Bool {return self._inboxPosition != nil} /// Clears the value of `inboxPosition`. Subsequent reads from it will return its default value. - mutating func clearInboxPosition() {_uniqueStorage()._inboxPosition = nil} + mutating func clearInboxPosition() {self._inboxPosition = nil} var archived: Bool { - get {return _storage._archived ?? false} - set {_uniqueStorage()._archived = newValue} + get {return _archived ?? false} + set {_archived = newValue} } /// Returns true if `archived` has been explicitly set. - var hasArchived: Bool {return _storage._archived != nil} + var hasArchived: Bool {return self._archived != nil} /// Clears the value of `archived`. Subsequent reads from it will return its default value. - mutating func clearArchived() {_uniqueStorage()._archived = nil} + mutating func clearArchived() {self._archived = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -2880,7 +2941,17 @@ struct SignalServiceProtos_ContactDetails { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _number: String? + fileprivate var _uuid: String? + fileprivate var _name: String? + fileprivate var _avatar: SignalServiceProtos_ContactDetails.Avatar? + fileprivate var _color: String? + fileprivate var _verified: SignalServiceProtos_Verified? + fileprivate var _profileKey: Data? + fileprivate var _blocked: Bool? + fileprivate var _expireTimer: UInt32? + fileprivate var _inboxPosition: UInt32? + fileprivate var _archived: Bool? } struct SignalServiceProtos_GroupDetails { @@ -2890,98 +2961,92 @@ struct SignalServiceProtos_GroupDetails { /// @required var id: Data { - get {return _storage._id ?? SwiftProtobuf.Internal.emptyData} - set {_uniqueStorage()._id = newValue} + get {return _id ?? SwiftProtobuf.Internal.emptyData} + set {_id = newValue} } /// Returns true if `id` has been explicitly set. - var hasID: Bool {return _storage._id != nil} + var hasID: Bool {return self._id != nil} /// Clears the value of `id`. Subsequent reads from it will return its default value. - mutating func clearID() {_uniqueStorage()._id = nil} + mutating func clearID() {self._id = nil} var name: String { - get {return _storage._name ?? String()} - set {_uniqueStorage()._name = newValue} + get {return _name ?? String()} + set {_name = newValue} } /// Returns true if `name` has been explicitly set. - var hasName: Bool {return _storage._name != nil} + var hasName: Bool {return self._name != nil} /// Clears the value of `name`. Subsequent reads from it will return its default value. - mutating func clearName() {_uniqueStorage()._name = nil} + mutating func clearName() {self._name = nil} /// A list of known phone numbers in the group, only maintained /// to support legacy apps that don't know about UUIDs. We may want /// to eventually stop populating this. - var membersE164: [String] { - get {return _storage._membersE164} - set {_uniqueStorage()._membersE164 = newValue} - } + var membersE164: [String] = [] var avatar: SignalServiceProtos_GroupDetails.Avatar { - get {return _storage._avatar ?? SignalServiceProtos_GroupDetails.Avatar()} - set {_uniqueStorage()._avatar = newValue} + get {return _avatar ?? SignalServiceProtos_GroupDetails.Avatar()} + set {_avatar = newValue} } /// Returns true if `avatar` has been explicitly set. - var hasAvatar: Bool {return _storage._avatar != nil} + var hasAvatar: Bool {return self._avatar != nil} /// Clears the value of `avatar`. Subsequent reads from it will return its default value. - mutating func clearAvatar() {_uniqueStorage()._avatar = nil} + mutating func clearAvatar() {self._avatar = nil} var active: Bool { - get {return _storage._active ?? true} - set {_uniqueStorage()._active = newValue} + get {return _active ?? true} + set {_active = newValue} } /// Returns true if `active` has been explicitly set. - var hasActive: Bool {return _storage._active != nil} + var hasActive: Bool {return self._active != nil} /// Clears the value of `active`. Subsequent reads from it will return its default value. - mutating func clearActive() {_uniqueStorage()._active = nil} + mutating func clearActive() {self._active = nil} var expireTimer: UInt32 { - get {return _storage._expireTimer ?? 0} - set {_uniqueStorage()._expireTimer = newValue} + get {return _expireTimer ?? 0} + set {_expireTimer = newValue} } /// Returns true if `expireTimer` has been explicitly set. - var hasExpireTimer: Bool {return _storage._expireTimer != nil} + var hasExpireTimer: Bool {return self._expireTimer != nil} /// Clears the value of `expireTimer`. Subsequent reads from it will return its default value. - mutating func clearExpireTimer() {_uniqueStorage()._expireTimer = nil} + mutating func clearExpireTimer() {self._expireTimer = nil} var color: String { - get {return _storage._color ?? String()} - set {_uniqueStorage()._color = newValue} + get {return _color ?? String()} + set {_color = newValue} } /// Returns true if `color` has been explicitly set. - var hasColor: Bool {return _storage._color != nil} + var hasColor: Bool {return self._color != nil} /// Clears the value of `color`. Subsequent reads from it will return its default value. - mutating func clearColor() {_uniqueStorage()._color = nil} + mutating func clearColor() {self._color = nil} var blocked: Bool { - get {return _storage._blocked ?? false} - set {_uniqueStorage()._blocked = newValue} + get {return _blocked ?? false} + set {_blocked = newValue} } /// Returns true if `blocked` has been explicitly set. - var hasBlocked: Bool {return _storage._blocked != nil} + var hasBlocked: Bool {return self._blocked != nil} /// Clears the value of `blocked`. Subsequent reads from it will return its default value. - mutating func clearBlocked() {_uniqueStorage()._blocked = nil} + mutating func clearBlocked() {self._blocked = nil} - var members: [SignalServiceProtos_GroupDetails.Member] { - get {return _storage._members} - set {_uniqueStorage()._members = newValue} - } + var members: [SignalServiceProtos_GroupDetails.Member] = [] var inboxPosition: UInt32 { - get {return _storage._inboxPosition ?? 0} - set {_uniqueStorage()._inboxPosition = newValue} + get {return _inboxPosition ?? 0} + set {_inboxPosition = newValue} } /// Returns true if `inboxPosition` has been explicitly set. - var hasInboxPosition: Bool {return _storage._inboxPosition != nil} + var hasInboxPosition: Bool {return self._inboxPosition != nil} /// Clears the value of `inboxPosition`. Subsequent reads from it will return its default value. - mutating func clearInboxPosition() {_uniqueStorage()._inboxPosition = nil} + mutating func clearInboxPosition() {self._inboxPosition = nil} var archived: Bool { - get {return _storage._archived ?? false} - set {_uniqueStorage()._archived = newValue} + get {return _archived ?? false} + set {_archived = newValue} } /// Returns true if `archived` has been explicitly set. - var hasArchived: Bool {return _storage._archived != nil} + var hasArchived: Bool {return self._archived != nil} /// Clears the value of `archived`. Subsequent reads from it will return its default value. - mutating func clearArchived() {_uniqueStorage()._archived = nil} + mutating func clearArchived() {self._archived = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -3049,7 +3114,15 @@ struct SignalServiceProtos_GroupDetails { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _id: Data? + fileprivate var _name: String? + fileprivate var _avatar: SignalServiceProtos_GroupDetails.Avatar? + fileprivate var _active: Bool? + fileprivate var _expireTimer: UInt32? + fileprivate var _color: String? + fileprivate var _blocked: Bool? + fileprivate var _inboxPosition: UInt32? + fileprivate var _archived: Bool? } struct SignalServiceProtos_Pack { @@ -3058,36 +3131,33 @@ struct SignalServiceProtos_Pack { // methods supported on all messages. var title: String { - get {return _storage._title ?? String()} - set {_uniqueStorage()._title = newValue} + get {return _title ?? String()} + set {_title = newValue} } /// Returns true if `title` has been explicitly set. - var hasTitle: Bool {return _storage._title != nil} + var hasTitle: Bool {return self._title != nil} /// Clears the value of `title`. Subsequent reads from it will return its default value. - mutating func clearTitle() {_uniqueStorage()._title = nil} + mutating func clearTitle() {self._title = nil} var author: String { - get {return _storage._author ?? String()} - set {_uniqueStorage()._author = newValue} + get {return _author ?? String()} + set {_author = newValue} } /// Returns true if `author` has been explicitly set. - var hasAuthor: Bool {return _storage._author != nil} + var hasAuthor: Bool {return self._author != nil} /// Clears the value of `author`. Subsequent reads from it will return its default value. - mutating func clearAuthor() {_uniqueStorage()._author = nil} + mutating func clearAuthor() {self._author = nil} var cover: SignalServiceProtos_Pack.Sticker { - get {return _storage._cover ?? SignalServiceProtos_Pack.Sticker()} - set {_uniqueStorage()._cover = newValue} + get {return _cover ?? SignalServiceProtos_Pack.Sticker()} + set {_cover = newValue} } /// Returns true if `cover` has been explicitly set. - var hasCover: Bool {return _storage._cover != nil} + var hasCover: Bool {return self._cover != nil} /// Clears the value of `cover`. Subsequent reads from it will return its default value. - mutating func clearCover() {_uniqueStorage()._cover = nil} + mutating func clearCover() {self._cover = nil} - var stickers: [SignalServiceProtos_Pack.Sticker] { - get {return _storage._stickers} - set {_uniqueStorage()._stickers = newValue} - } + var stickers: [SignalServiceProtos_Pack.Sticker] = [] var unknownFields = SwiftProtobuf.UnknownStorage() @@ -3125,7 +3195,9 @@ struct SignalServiceProtos_Pack { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _title: String? + fileprivate var _author: String? + fileprivate var _cover: SignalServiceProtos_Pack.Sticker? } // MARK: - Code below here is support for the SwiftProtobuf runtime. @@ -3285,91 +3357,49 @@ extension SignalServiceProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._Mes 6: .same(proto: "typingMessage") ] - fileprivate class _StorageClass { - var _dataMessage: SignalServiceProtos_DataMessage? - var _syncMessage: SignalServiceProtos_SyncMessage? - var _callMessage: SignalServiceProtos_CallMessage? - var _nullMessage: SignalServiceProtos_NullMessage? - var _receiptMessage: SignalServiceProtos_ReceiptMessage? - var _typingMessage: SignalServiceProtos_TypingMessage? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _dataMessage = source._dataMessage - _syncMessage = source._syncMessage - _callMessage = source._callMessage - _nullMessage = source._nullMessage - _receiptMessage = source._receiptMessage - _typingMessage = source._typingMessage - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._dataMessage) - case 2: try decoder.decodeSingularMessageField(value: &_storage._syncMessage) - case 3: try decoder.decodeSingularMessageField(value: &_storage._callMessage) - case 4: try decoder.decodeSingularMessageField(value: &_storage._nullMessage) - case 5: try decoder.decodeSingularMessageField(value: &_storage._receiptMessage) - case 6: try decoder.decodeSingularMessageField(value: &_storage._typingMessage) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._dataMessage) + case 2: try decoder.decodeSingularMessageField(value: &self._syncMessage) + case 3: try decoder.decodeSingularMessageField(value: &self._callMessage) + case 4: try decoder.decodeSingularMessageField(value: &self._nullMessage) + case 5: try decoder.decodeSingularMessageField(value: &self._receiptMessage) + case 6: try decoder.decodeSingularMessageField(value: &self._typingMessage) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._dataMessage { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if let v = _storage._syncMessage { - try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - } - if let v = _storage._callMessage { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } - if let v = _storage._nullMessage { - try visitor.visitSingularMessageField(value: v, fieldNumber: 4) - } - if let v = _storage._receiptMessage { - try visitor.visitSingularMessageField(value: v, fieldNumber: 5) - } - if let v = _storage._typingMessage { - try visitor.visitSingularMessageField(value: v, fieldNumber: 6) - } + if let v = self._dataMessage { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if let v = self._syncMessage { + try visitor.visitSingularMessageField(value: v, fieldNumber: 2) + } + if let v = self._callMessage { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) + } + if let v = self._nullMessage { + try visitor.visitSingularMessageField(value: v, fieldNumber: 4) + } + if let v = self._receiptMessage { + try visitor.visitSingularMessageField(value: v, fieldNumber: 5) + } + if let v = self._typingMessage { + try visitor.visitSingularMessageField(value: v, fieldNumber: 6) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_Content, rhs: SignalServiceProtos_Content) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._dataMessage != rhs_storage._dataMessage {return false} - if _storage._syncMessage != rhs_storage._syncMessage {return false} - if _storage._callMessage != rhs_storage._callMessage {return false} - if _storage._nullMessage != rhs_storage._nullMessage {return false} - if _storage._receiptMessage != rhs_storage._receiptMessage {return false} - if _storage._typingMessage != rhs_storage._typingMessage {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._dataMessage != rhs._dataMessage {return false} + if lhs._syncMessage != rhs._syncMessage {return false} + if lhs._callMessage != rhs._callMessage {return false} + if lhs._nullMessage != rhs._nullMessage {return false} + if lhs._receiptMessage != rhs._receiptMessage {return false} + if lhs._typingMessage != rhs._typingMessage {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -3386,91 +3416,49 @@ extension SignalServiceProtos_CallMessage: SwiftProtobuf.Message, SwiftProtobuf. 6: .same(proto: "profileKey") ] - fileprivate class _StorageClass { - var _offer: SignalServiceProtos_CallMessage.Offer? - var _answer: SignalServiceProtos_CallMessage.Answer? - var _iceUpdate: [SignalServiceProtos_CallMessage.IceUpdate] = [] - var _hangup: SignalServiceProtos_CallMessage.Hangup? - var _busy: SignalServiceProtos_CallMessage.Busy? - var _profileKey: Data? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _offer = source._offer - _answer = source._answer - _iceUpdate = source._iceUpdate - _hangup = source._hangup - _busy = source._busy - _profileKey = source._profileKey - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._offer) - case 2: try decoder.decodeSingularMessageField(value: &_storage._answer) - case 3: try decoder.decodeRepeatedMessageField(value: &_storage._iceUpdate) - case 4: try decoder.decodeSingularMessageField(value: &_storage._hangup) - case 5: try decoder.decodeSingularMessageField(value: &_storage._busy) - case 6: try decoder.decodeSingularBytesField(value: &_storage._profileKey) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._offer) + case 2: try decoder.decodeSingularMessageField(value: &self._answer) + case 3: try decoder.decodeRepeatedMessageField(value: &self.iceUpdate) + case 4: try decoder.decodeSingularMessageField(value: &self._hangup) + case 5: try decoder.decodeSingularMessageField(value: &self._busy) + case 6: try decoder.decodeSingularBytesField(value: &self._profileKey) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._offer { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if let v = _storage._answer { - try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - } - if !_storage._iceUpdate.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._iceUpdate, fieldNumber: 3) - } - if let v = _storage._hangup { - try visitor.visitSingularMessageField(value: v, fieldNumber: 4) - } - if let v = _storage._busy { - try visitor.visitSingularMessageField(value: v, fieldNumber: 5) - } - if let v = _storage._profileKey { - try visitor.visitSingularBytesField(value: v, fieldNumber: 6) - } + if let v = self._offer { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if let v = self._answer { + try visitor.visitSingularMessageField(value: v, fieldNumber: 2) + } + if !self.iceUpdate.isEmpty { + try visitor.visitRepeatedMessageField(value: self.iceUpdate, fieldNumber: 3) + } + if let v = self._hangup { + try visitor.visitSingularMessageField(value: v, fieldNumber: 4) + } + if let v = self._busy { + try visitor.visitSingularMessageField(value: v, fieldNumber: 5) + } + if let v = self._profileKey { + try visitor.visitSingularBytesField(value: v, fieldNumber: 6) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_CallMessage, rhs: SignalServiceProtos_CallMessage) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._offer != rhs_storage._offer {return false} - if _storage._answer != rhs_storage._answer {return false} - if _storage._iceUpdate != rhs_storage._iceUpdate {return false} - if _storage._hangup != rhs_storage._hangup {return false} - if _storage._busy != rhs_storage._busy {return false} - if _storage._profileKey != rhs_storage._profileKey {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._offer != rhs._offer {return false} + if lhs._answer != rhs._answer {return false} + if lhs.iceUpdate != rhs.iceUpdate {return false} + if lhs._hangup != rhs._hangup {return false} + if lhs._busy != rhs._busy {return false} + if lhs._profileKey != rhs._profileKey {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -3671,154 +3659,94 @@ extension SignalServiceProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf. 16: .same(proto: "reaction") ] - fileprivate class _StorageClass { - var _body: String? - var _attachments: [SignalServiceProtos_AttachmentPointer] = [] - var _group: SignalServiceProtos_GroupContext? - var _groupV2: SignalServiceProtos_GroupContextV2? - var _flags: UInt32? - var _expireTimer: UInt32? - var _profileKey: Data? - var _timestamp: UInt64? - var _quote: SignalServiceProtos_DataMessage.Quote? - var _contact: [SignalServiceProtos_DataMessage.Contact] = [] - var _preview: [SignalServiceProtos_DataMessage.Preview] = [] - var _sticker: SignalServiceProtos_DataMessage.Sticker? - var _requiredProtocolVersion: UInt32? - var _isViewOnce: Bool? - var _reaction: SignalServiceProtos_DataMessage.Reaction? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _body = source._body - _attachments = source._attachments - _group = source._group - _groupV2 = source._groupV2 - _flags = source._flags - _expireTimer = source._expireTimer - _profileKey = source._profileKey - _timestamp = source._timestamp - _quote = source._quote - _contact = source._contact - _preview = source._preview - _sticker = source._sticker - _requiredProtocolVersion = source._requiredProtocolVersion - _isViewOnce = source._isViewOnce - _reaction = source._reaction - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularStringField(value: &_storage._body) - case 2: try decoder.decodeRepeatedMessageField(value: &_storage._attachments) - case 3: try decoder.decodeSingularMessageField(value: &_storage._group) - case 4: try decoder.decodeSingularUInt32Field(value: &_storage._flags) - case 5: try decoder.decodeSingularUInt32Field(value: &_storage._expireTimer) - case 6: try decoder.decodeSingularBytesField(value: &_storage._profileKey) - case 7: try decoder.decodeSingularUInt64Field(value: &_storage._timestamp) - case 8: try decoder.decodeSingularMessageField(value: &_storage._quote) - case 9: try decoder.decodeRepeatedMessageField(value: &_storage._contact) - case 10: try decoder.decodeRepeatedMessageField(value: &_storage._preview) - case 11: try decoder.decodeSingularMessageField(value: &_storage._sticker) - case 12: try decoder.decodeSingularUInt32Field(value: &_storage._requiredProtocolVersion) - case 14: try decoder.decodeSingularBoolField(value: &_storage._isViewOnce) - case 15: try decoder.decodeSingularMessageField(value: &_storage._groupV2) - case 16: try decoder.decodeSingularMessageField(value: &_storage._reaction) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularStringField(value: &self._body) + case 2: try decoder.decodeRepeatedMessageField(value: &self.attachments) + case 3: try decoder.decodeSingularMessageField(value: &self._group) + case 4: try decoder.decodeSingularUInt32Field(value: &self._flags) + case 5: try decoder.decodeSingularUInt32Field(value: &self._expireTimer) + case 6: try decoder.decodeSingularBytesField(value: &self._profileKey) + case 7: try decoder.decodeSingularUInt64Field(value: &self._timestamp) + case 8: try decoder.decodeSingularMessageField(value: &self._quote) + case 9: try decoder.decodeRepeatedMessageField(value: &self.contact) + case 10: try decoder.decodeRepeatedMessageField(value: &self.preview) + case 11: try decoder.decodeSingularMessageField(value: &self._sticker) + case 12: try decoder.decodeSingularUInt32Field(value: &self._requiredProtocolVersion) + case 14: try decoder.decodeSingularBoolField(value: &self._isViewOnce) + case 15: try decoder.decodeSingularMessageField(value: &self._groupV2) + case 16: try decoder.decodeSingularMessageField(value: &self._reaction) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._body { - try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if !_storage._attachments.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._attachments, fieldNumber: 2) - } - if let v = _storage._group { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } - if let v = _storage._flags { - try visitor.visitSingularUInt32Field(value: v, fieldNumber: 4) - } - if let v = _storage._expireTimer { - try visitor.visitSingularUInt32Field(value: v, fieldNumber: 5) - } - if let v = _storage._profileKey { - try visitor.visitSingularBytesField(value: v, fieldNumber: 6) - } - if let v = _storage._timestamp { - try visitor.visitSingularUInt64Field(value: v, fieldNumber: 7) - } - if let v = _storage._quote { - try visitor.visitSingularMessageField(value: v, fieldNumber: 8) - } - if !_storage._contact.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._contact, fieldNumber: 9) - } - if !_storage._preview.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._preview, fieldNumber: 10) - } - if let v = _storage._sticker { - try visitor.visitSingularMessageField(value: v, fieldNumber: 11) - } - if let v = _storage._requiredProtocolVersion { - try visitor.visitSingularUInt32Field(value: v, fieldNumber: 12) - } - if let v = _storage._isViewOnce { - try visitor.visitSingularBoolField(value: v, fieldNumber: 14) - } - if let v = _storage._groupV2 { - try visitor.visitSingularMessageField(value: v, fieldNumber: 15) - } - if let v = _storage._reaction { - try visitor.visitSingularMessageField(value: v, fieldNumber: 16) - } + if let v = self._body { + try visitor.visitSingularStringField(value: v, fieldNumber: 1) + } + if !self.attachments.isEmpty { + try visitor.visitRepeatedMessageField(value: self.attachments, fieldNumber: 2) + } + if let v = self._group { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) + } + if let v = self._flags { + try visitor.visitSingularUInt32Field(value: v, fieldNumber: 4) + } + if let v = self._expireTimer { + try visitor.visitSingularUInt32Field(value: v, fieldNumber: 5) + } + if let v = self._profileKey { + try visitor.visitSingularBytesField(value: v, fieldNumber: 6) + } + if let v = self._timestamp { + try visitor.visitSingularUInt64Field(value: v, fieldNumber: 7) + } + if let v = self._quote { + try visitor.visitSingularMessageField(value: v, fieldNumber: 8) + } + if !self.contact.isEmpty { + try visitor.visitRepeatedMessageField(value: self.contact, fieldNumber: 9) + } + if !self.preview.isEmpty { + try visitor.visitRepeatedMessageField(value: self.preview, fieldNumber: 10) + } + if let v = self._sticker { + try visitor.visitSingularMessageField(value: v, fieldNumber: 11) + } + if let v = self._requiredProtocolVersion { + try visitor.visitSingularUInt32Field(value: v, fieldNumber: 12) + } + if let v = self._isViewOnce { + try visitor.visitSingularBoolField(value: v, fieldNumber: 14) + } + if let v = self._groupV2 { + try visitor.visitSingularMessageField(value: v, fieldNumber: 15) + } + if let v = self._reaction { + try visitor.visitSingularMessageField(value: v, fieldNumber: 16) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_DataMessage, rhs: SignalServiceProtos_DataMessage) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._body != rhs_storage._body {return false} - if _storage._attachments != rhs_storage._attachments {return false} - if _storage._group != rhs_storage._group {return false} - if _storage._groupV2 != rhs_storage._groupV2 {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} - if _storage._contact != rhs_storage._contact {return false} - if _storage._preview != rhs_storage._preview {return false} - if _storage._sticker != rhs_storage._sticker {return false} - if _storage._requiredProtocolVersion != rhs_storage._requiredProtocolVersion {return false} - if _storage._isViewOnce != rhs_storage._isViewOnce {return false} - if _storage._reaction != rhs_storage._reaction {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._body != rhs._body {return false} + if lhs.attachments != rhs.attachments {return false} + if lhs._group != rhs._group {return false} + if lhs._groupV2 != rhs._groupV2 {return false} + if lhs._flags != rhs._flags {return false} + if lhs._expireTimer != rhs._expireTimer {return false} + if lhs._profileKey != rhs._profileKey {return false} + if lhs._timestamp != rhs._timestamp {return false} + if lhs._quote != rhs._quote {return false} + if lhs.contact != rhs.contact {return false} + if lhs.preview != rhs.preview {return false} + if lhs._sticker != rhs._sticker {return false} + if lhs._requiredProtocolVersion != rhs._requiredProtocolVersion {return false} + if lhs._isViewOnce != rhs._isViewOnce {return false} + if lhs._reaction != rhs._reaction {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -3904,77 +3832,39 @@ extension SignalServiceProtos_DataMessage.Quote.QuotedAttachment: SwiftProtobuf. 4: .same(proto: "flags") ] - fileprivate class _StorageClass { - var _contentType: String? - var _fileName: String? - var _thumbnail: SignalServiceProtos_AttachmentPointer? - var _flags: UInt32? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _contentType = source._contentType - _fileName = source._fileName - _thumbnail = source._thumbnail - _flags = source._flags - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularStringField(value: &_storage._contentType) - case 2: try decoder.decodeSingularStringField(value: &_storage._fileName) - case 3: try decoder.decodeSingularMessageField(value: &_storage._thumbnail) - case 4: try decoder.decodeSingularUInt32Field(value: &_storage._flags) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularStringField(value: &self._contentType) + case 2: try decoder.decodeSingularStringField(value: &self._fileName) + case 3: try decoder.decodeSingularMessageField(value: &self._thumbnail) + case 4: try decoder.decodeSingularUInt32Field(value: &self._flags) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._contentType { - try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = _storage._fileName { - try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = _storage._thumbnail { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } - if let v = _storage._flags { - try visitor.visitSingularUInt32Field(value: v, fieldNumber: 4) - } + if let v = self._contentType { + try visitor.visitSingularStringField(value: v, fieldNumber: 1) + } + if let v = self._fileName { + try visitor.visitSingularStringField(value: v, fieldNumber: 2) + } + if let v = self._thumbnail { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) + } + if let v = self._flags { + try visitor.visitSingularUInt32Field(value: v, fieldNumber: 4) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_DataMessage.Quote.QuotedAttachment, rhs: SignalServiceProtos_DataMessage.Quote.QuotedAttachment) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._contentType != rhs_storage._contentType {return false} - if _storage._fileName != rhs_storage._fileName {return false} - if _storage._thumbnail != rhs_storage._thumbnail {return false} - if _storage._flags != rhs_storage._flags {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._contentType != rhs._contentType {return false} + if lhs._fileName != rhs._fileName {return false} + if lhs._thumbnail != rhs._thumbnail {return false} + if lhs._flags != rhs._flags {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -3997,91 +3887,49 @@ extension SignalServiceProtos_DataMessage.Contact: SwiftProtobuf.Message, SwiftP 7: .same(proto: "organization") ] - fileprivate class _StorageClass { - var _name: SignalServiceProtos_DataMessage.Contact.Name? - var _number: [SignalServiceProtos_DataMessage.Contact.Phone] = [] - var _email: [SignalServiceProtos_DataMessage.Contact.Email] = [] - var _address: [SignalServiceProtos_DataMessage.Contact.PostalAddress] = [] - var _avatar: SignalServiceProtos_DataMessage.Contact.Avatar? - var _organization: String? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _name = source._name - _number = source._number - _email = source._email - _address = source._address - _avatar = source._avatar - _organization = source._organization - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._name) - case 3: try decoder.decodeRepeatedMessageField(value: &_storage._number) - case 4: try decoder.decodeRepeatedMessageField(value: &_storage._email) - case 5: try decoder.decodeRepeatedMessageField(value: &_storage._address) - case 6: try decoder.decodeSingularMessageField(value: &_storage._avatar) - case 7: try decoder.decodeSingularStringField(value: &_storage._organization) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._name) + case 3: try decoder.decodeRepeatedMessageField(value: &self.number) + case 4: try decoder.decodeRepeatedMessageField(value: &self.email) + case 5: try decoder.decodeRepeatedMessageField(value: &self.address) + case 6: try decoder.decodeSingularMessageField(value: &self._avatar) + case 7: try decoder.decodeSingularStringField(value: &self._organization) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._name { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if !_storage._number.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._number, fieldNumber: 3) - } - if !_storage._email.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._email, fieldNumber: 4) - } - if !_storage._address.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._address, fieldNumber: 5) - } - if let v = _storage._avatar { - try visitor.visitSingularMessageField(value: v, fieldNumber: 6) - } - if let v = _storage._organization { - try visitor.visitSingularStringField(value: v, fieldNumber: 7) - } + if let v = self._name { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if !self.number.isEmpty { + try visitor.visitRepeatedMessageField(value: self.number, fieldNumber: 3) + } + if !self.email.isEmpty { + try visitor.visitRepeatedMessageField(value: self.email, fieldNumber: 4) + } + if !self.address.isEmpty { + try visitor.visitRepeatedMessageField(value: self.address, fieldNumber: 5) + } + if let v = self._avatar { + try visitor.visitSingularMessageField(value: v, fieldNumber: 6) + } + if let v = self._organization { + try visitor.visitSingularStringField(value: v, fieldNumber: 7) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_DataMessage.Contact, rhs: SignalServiceProtos_DataMessage.Contact) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._name != rhs_storage._name {return false} - if _storage._number != rhs_storage._number {return false} - if _storage._email != rhs_storage._email {return false} - if _storage._address != rhs_storage._address {return false} - if _storage._avatar != rhs_storage._avatar {return false} - if _storage._organization != rhs_storage._organization {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._name != rhs._name {return false} + if lhs.number != rhs.number {return false} + if lhs.email != rhs.email {return false} + if lhs.address != rhs.address {return false} + if lhs._avatar != rhs._avatar {return false} + if lhs._organization != rhs._organization {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -4338,63 +4186,29 @@ extension SignalServiceProtos_DataMessage.Contact.Avatar: SwiftProtobuf.Message, 2: .same(proto: "isProfile") ] - fileprivate class _StorageClass { - var _avatar: SignalServiceProtos_AttachmentPointer? - var _isProfile: Bool? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _avatar = source._avatar - _isProfile = source._isProfile - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._avatar) - case 2: try decoder.decodeSingularBoolField(value: &_storage._isProfile) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._avatar) + case 2: try decoder.decodeSingularBoolField(value: &self._isProfile) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._avatar { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if let v = _storage._isProfile { - try visitor.visitSingularBoolField(value: v, fieldNumber: 2) - } + if let v = self._avatar { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if let v = self._isProfile { + try visitor.visitSingularBoolField(value: v, fieldNumber: 2) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_DataMessage.Contact.Avatar, rhs: SignalServiceProtos_DataMessage.Contact.Avatar) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._avatar != rhs_storage._avatar {return false} - if _storage._isProfile != rhs_storage._isProfile {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._avatar != rhs._avatar {return false} + if lhs._isProfile != rhs._isProfile {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -4408,70 +4222,34 @@ extension SignalServiceProtos_DataMessage.Preview: SwiftProtobuf.Message, SwiftP 3: .same(proto: "image") ] - fileprivate class _StorageClass { - var _url: String? - var _title: String? - var _image: SignalServiceProtos_AttachmentPointer? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _url = source._url - _title = source._title - _image = source._image - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularStringField(value: &_storage._url) - case 2: try decoder.decodeSingularStringField(value: &_storage._title) - case 3: try decoder.decodeSingularMessageField(value: &_storage._image) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularStringField(value: &self._url) + case 2: try decoder.decodeSingularStringField(value: &self._title) + case 3: try decoder.decodeSingularMessageField(value: &self._image) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._url { - try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = _storage._title { - try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = _storage._image { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } + if let v = self._url { + try visitor.visitSingularStringField(value: v, fieldNumber: 1) + } + if let v = self._title { + try visitor.visitSingularStringField(value: v, fieldNumber: 2) + } + if let v = self._image { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_DataMessage.Preview, rhs: SignalServiceProtos_DataMessage.Preview) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._url != rhs_storage._url {return false} - if _storage._title != rhs_storage._title {return false} - if _storage._image != rhs_storage._image {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._url != rhs._url {return false} + if lhs._title != rhs._title {return false} + if lhs._image != rhs._image {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -4486,77 +4264,39 @@ extension SignalServiceProtos_DataMessage.Sticker: SwiftProtobuf.Message, SwiftP 4: .same(proto: "data") ] - fileprivate class _StorageClass { - var _packID: Data? - var _packKey: Data? - var _stickerID: UInt32? - var _data: SignalServiceProtos_AttachmentPointer? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _packID = source._packID - _packKey = source._packKey - _stickerID = source._stickerID - _data = source._data - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularBytesField(value: &_storage._packID) - case 2: try decoder.decodeSingularBytesField(value: &_storage._packKey) - case 3: try decoder.decodeSingularUInt32Field(value: &_storage._stickerID) - case 4: try decoder.decodeSingularMessageField(value: &_storage._data) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularBytesField(value: &self._packID) + case 2: try decoder.decodeSingularBytesField(value: &self._packKey) + case 3: try decoder.decodeSingularUInt32Field(value: &self._stickerID) + case 4: try decoder.decodeSingularMessageField(value: &self._data) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._packID { - try visitor.visitSingularBytesField(value: v, fieldNumber: 1) - } - if let v = _storage._packKey { - try visitor.visitSingularBytesField(value: v, fieldNumber: 2) - } - if let v = _storage._stickerID { - try visitor.visitSingularUInt32Field(value: v, fieldNumber: 3) - } - if let v = _storage._data { - try visitor.visitSingularMessageField(value: v, fieldNumber: 4) - } + if let v = self._packID { + try visitor.visitSingularBytesField(value: v, fieldNumber: 1) + } + if let v = self._packKey { + try visitor.visitSingularBytesField(value: v, fieldNumber: 2) + } + if let v = self._stickerID { + try visitor.visitSingularUInt32Field(value: v, fieldNumber: 3) + } + if let v = self._data { + try visitor.visitSingularMessageField(value: v, fieldNumber: 4) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_DataMessage.Sticker, rhs: SignalServiceProtos_DataMessage.Sticker) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._packID != rhs_storage._packID {return false} - if _storage._packKey != rhs_storage._packKey {return false} - if _storage._stickerID != rhs_storage._stickerID {return false} - if _storage._data != rhs_storage._data {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._packID != rhs._packID {return false} + if lhs._packKey != rhs._packKey {return false} + if lhs._stickerID != rhs._stickerID {return false} + if lhs._data != rhs._data {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -4766,147 +4506,89 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf. 14: .same(proto: "messageRequestResponse") ] - fileprivate class _StorageClass { - var _sent: SignalServiceProtos_SyncMessage.Sent? - var _contacts: SignalServiceProtos_SyncMessage.Contacts? - var _groups: SignalServiceProtos_SyncMessage.Groups? - var _request: SignalServiceProtos_SyncMessage.Request? - var _read: [SignalServiceProtos_SyncMessage.Read] = [] - var _blocked: SignalServiceProtos_SyncMessage.Blocked? - var _verified: SignalServiceProtos_Verified? - var _configuration: SignalServiceProtos_SyncMessage.Configuration? - var _padding: Data? - var _stickerPackOperation: [SignalServiceProtos_SyncMessage.StickerPackOperation] = [] - var _viewOnceOpen: SignalServiceProtos_SyncMessage.ViewOnceOpen? - var _fetchLatest: SignalServiceProtos_SyncMessage.FetchLatest? - var _keys: SignalServiceProtos_SyncMessage.Keys? - var _messageRequestResponse: SignalServiceProtos_SyncMessage.MessageRequestResponse? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _sent = source._sent - _contacts = source._contacts - _groups = source._groups - _request = source._request - _read = source._read - _blocked = source._blocked - _verified = source._verified - _configuration = source._configuration - _padding = source._padding - _stickerPackOperation = source._stickerPackOperation - _viewOnceOpen = source._viewOnceOpen - _fetchLatest = source._fetchLatest - _keys = source._keys - _messageRequestResponse = source._messageRequestResponse - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._sent) - case 2: try decoder.decodeSingularMessageField(value: &_storage._contacts) - case 3: try decoder.decodeSingularMessageField(value: &_storage._groups) - case 4: try decoder.decodeSingularMessageField(value: &_storage._request) - case 5: try decoder.decodeRepeatedMessageField(value: &_storage._read) - case 6: try decoder.decodeSingularMessageField(value: &_storage._blocked) - 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.decodeRepeatedMessageField(value: &_storage._stickerPackOperation) - case 11: try decoder.decodeSingularMessageField(value: &_storage._viewOnceOpen) - case 12: try decoder.decodeSingularMessageField(value: &_storage._fetchLatest) - case 13: try decoder.decodeSingularMessageField(value: &_storage._keys) - case 14: try decoder.decodeSingularMessageField(value: &_storage._messageRequestResponse) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._sent) + case 2: try decoder.decodeSingularMessageField(value: &self._contacts) + case 3: try decoder.decodeSingularMessageField(value: &self._groups) + case 4: try decoder.decodeSingularMessageField(value: &self._request) + case 5: try decoder.decodeRepeatedMessageField(value: &self.read) + case 6: try decoder.decodeSingularMessageField(value: &self._blocked) + case 7: try decoder.decodeSingularMessageField(value: &self._verified) + case 8: try decoder.decodeSingularBytesField(value: &self._padding) + case 9: try decoder.decodeSingularMessageField(value: &self._configuration) + case 10: try decoder.decodeRepeatedMessageField(value: &self.stickerPackOperation) + case 11: try decoder.decodeSingularMessageField(value: &self._viewOnceOpen) + case 12: try decoder.decodeSingularMessageField(value: &self._fetchLatest) + case 13: try decoder.decodeSingularMessageField(value: &self._keys) + case 14: try decoder.decodeSingularMessageField(value: &self._messageRequestResponse) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._sent { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if let v = _storage._contacts { - try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - } - if let v = _storage._groups { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } - if let v = _storage._request { - try visitor.visitSingularMessageField(value: v, fieldNumber: 4) - } - if !_storage._read.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._read, fieldNumber: 5) - } - if let v = _storage._blocked { - try visitor.visitSingularMessageField(value: v, fieldNumber: 6) - } - if let v = _storage._verified { - try visitor.visitSingularMessageField(value: v, fieldNumber: 7) - } - if let v = _storage._padding { - try visitor.visitSingularBytesField(value: v, fieldNumber: 8) - } - if let v = _storage._configuration { - try visitor.visitSingularMessageField(value: v, fieldNumber: 9) - } - if !_storage._stickerPackOperation.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._stickerPackOperation, fieldNumber: 10) - } - if let v = _storage._viewOnceOpen { - try visitor.visitSingularMessageField(value: v, fieldNumber: 11) - } - if let v = _storage._fetchLatest { - try visitor.visitSingularMessageField(value: v, fieldNumber: 12) - } - if let v = _storage._keys { - try visitor.visitSingularMessageField(value: v, fieldNumber: 13) - } - if let v = _storage._messageRequestResponse { - try visitor.visitSingularMessageField(value: v, fieldNumber: 14) - } + if let v = self._sent { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if let v = self._contacts { + try visitor.visitSingularMessageField(value: v, fieldNumber: 2) + } + if let v = self._groups { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) + } + if let v = self._request { + try visitor.visitSingularMessageField(value: v, fieldNumber: 4) + } + if !self.read.isEmpty { + try visitor.visitRepeatedMessageField(value: self.read, fieldNumber: 5) + } + if let v = self._blocked { + try visitor.visitSingularMessageField(value: v, fieldNumber: 6) + } + if let v = self._verified { + try visitor.visitSingularMessageField(value: v, fieldNumber: 7) + } + if let v = self._padding { + try visitor.visitSingularBytesField(value: v, fieldNumber: 8) + } + if let v = self._configuration { + try visitor.visitSingularMessageField(value: v, fieldNumber: 9) + } + if !self.stickerPackOperation.isEmpty { + try visitor.visitRepeatedMessageField(value: self.stickerPackOperation, fieldNumber: 10) + } + if let v = self._viewOnceOpen { + try visitor.visitSingularMessageField(value: v, fieldNumber: 11) + } + if let v = self._fetchLatest { + try visitor.visitSingularMessageField(value: v, fieldNumber: 12) + } + if let v = self._keys { + try visitor.visitSingularMessageField(value: v, fieldNumber: 13) + } + if let v = self._messageRequestResponse { + try visitor.visitSingularMessageField(value: v, fieldNumber: 14) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_SyncMessage, rhs: SignalServiceProtos_SyncMessage) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._sent != rhs_storage._sent {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} - if _storage._read != rhs_storage._read {return false} - if _storage._blocked != rhs_storage._blocked {return false} - if _storage._verified != rhs_storage._verified {return false} - if _storage._configuration != rhs_storage._configuration {return false} - if _storage._padding != rhs_storage._padding {return false} - if _storage._stickerPackOperation != rhs_storage._stickerPackOperation {return false} - if _storage._viewOnceOpen != rhs_storage._viewOnceOpen {return false} - if _storage._fetchLatest != rhs_storage._fetchLatest {return false} - if _storage._keys != rhs_storage._keys {return false} - if _storage._messageRequestResponse != rhs_storage._messageRequestResponse {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._sent != rhs._sent {return false} + if lhs._contacts != rhs._contacts {return false} + if lhs._groups != rhs._groups {return false} + if lhs._request != rhs._request {return false} + if lhs.read != rhs.read {return false} + if lhs._blocked != rhs._blocked {return false} + if lhs._verified != rhs._verified {return false} + if lhs._configuration != rhs._configuration {return false} + if lhs._padding != rhs._padding {return false} + if lhs.stickerPackOperation != rhs.stickerPackOperation {return false} + if lhs._viewOnceOpen != rhs._viewOnceOpen {return false} + if lhs._fetchLatest != rhs._fetchLatest {return false} + if lhs._keys != rhs._keys {return false} + if lhs._messageRequestResponse != rhs._messageRequestResponse {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -4924,98 +4606,54 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt 6: .same(proto: "isRecipientUpdate") ] - fileprivate class _StorageClass { - var _destinationE164: String? - var _destinationUuid: String? - var _timestamp: UInt64? - var _message: SignalServiceProtos_DataMessage? - var _expirationStartTimestamp: UInt64? - var _unidentifiedStatus: [SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus] = [] - var _isRecipientUpdate: Bool? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _destinationE164 = source._destinationE164 - _destinationUuid = source._destinationUuid - _timestamp = source._timestamp - _message = source._message - _expirationStartTimestamp = source._expirationStartTimestamp - _unidentifiedStatus = source._unidentifiedStatus - _isRecipientUpdate = source._isRecipientUpdate - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularStringField(value: &_storage._destinationE164) - case 2: try decoder.decodeSingularUInt64Field(value: &_storage._timestamp) - 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._isRecipientUpdate) - case 7: try decoder.decodeSingularStringField(value: &_storage._destinationUuid) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularStringField(value: &self._destinationE164) + case 2: try decoder.decodeSingularUInt64Field(value: &self._timestamp) + case 3: try decoder.decodeSingularMessageField(value: &self._message) + case 4: try decoder.decodeSingularUInt64Field(value: &self._expirationStartTimestamp) + case 5: try decoder.decodeRepeatedMessageField(value: &self.unidentifiedStatus) + case 6: try decoder.decodeSingularBoolField(value: &self._isRecipientUpdate) + case 7: try decoder.decodeSingularStringField(value: &self._destinationUuid) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._destinationE164 { - try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = _storage._timestamp { - try visitor.visitSingularUInt64Field(value: v, fieldNumber: 2) - } - if let v = _storage._message { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } - if let v = _storage._expirationStartTimestamp { - try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) - } - if !_storage._unidentifiedStatus.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._unidentifiedStatus, fieldNumber: 5) - } - if let v = _storage._isRecipientUpdate { - try visitor.visitSingularBoolField(value: v, fieldNumber: 6) - } - if let v = _storage._destinationUuid { - try visitor.visitSingularStringField(value: v, fieldNumber: 7) - } + if let v = self._destinationE164 { + try visitor.visitSingularStringField(value: v, fieldNumber: 1) + } + if let v = self._timestamp { + try visitor.visitSingularUInt64Field(value: v, fieldNumber: 2) + } + if let v = self._message { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) + } + if let v = self._expirationStartTimestamp { + try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) + } + if !self.unidentifiedStatus.isEmpty { + try visitor.visitRepeatedMessageField(value: self.unidentifiedStatus, fieldNumber: 5) + } + if let v = self._isRecipientUpdate { + try visitor.visitSingularBoolField(value: v, fieldNumber: 6) + } + if let v = self._destinationUuid { + try visitor.visitSingularStringField(value: v, fieldNumber: 7) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_SyncMessage.Sent, rhs: SignalServiceProtos_SyncMessage.Sent) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._destinationE164 != rhs_storage._destinationE164 {return false} - if _storage._destinationUuid != rhs_storage._destinationUuid {return false} - if _storage._timestamp != rhs_storage._timestamp {return false} - 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._isRecipientUpdate != rhs_storage._isRecipientUpdate {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._destinationE164 != rhs._destinationE164 {return false} + if lhs._destinationUuid != rhs._destinationUuid {return false} + if lhs._timestamp != rhs._timestamp {return false} + if lhs._message != rhs._message {return false} + if lhs._expirationStartTimestamp != rhs._expirationStartTimestamp {return false} + if lhs.unidentifiedStatus != rhs.unidentifiedStatus {return false} + if lhs._isRecipientUpdate != rhs._isRecipientUpdate {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -5069,63 +4707,29 @@ extension SignalServiceProtos_SyncMessage.Contacts: SwiftProtobuf.Message, Swift 2: .same(proto: "isComplete") ] - fileprivate class _StorageClass { - var _blob: SignalServiceProtos_AttachmentPointer? - var _isComplete: Bool? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _blob = source._blob - _isComplete = source._isComplete - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._blob) - case 2: try decoder.decodeSingularBoolField(value: &_storage._isComplete) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._blob) + case 2: try decoder.decodeSingularBoolField(value: &self._isComplete) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._blob { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if let v = _storage._isComplete { - try visitor.visitSingularBoolField(value: v, fieldNumber: 2) - } + if let v = self._blob { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if let v = self._isComplete { + try visitor.visitSingularBoolField(value: v, fieldNumber: 2) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_SyncMessage.Contacts, rhs: SignalServiceProtos_SyncMessage.Contacts) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._blob != rhs_storage._blob {return false} - if _storage._isComplete != rhs_storage._isComplete {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._blob != rhs._blob {return false} + if lhs._isComplete != rhs._isComplete {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -5137,56 +4741,24 @@ extension SignalServiceProtos_SyncMessage.Groups: SwiftProtobuf.Message, SwiftPr 1: .same(proto: "blob") ] - fileprivate class _StorageClass { - var _blob: SignalServiceProtos_AttachmentPointer? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _blob = source._blob - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._blob) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._blob) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._blob { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } + if let v = self._blob { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_SyncMessage.Groups, rhs: SignalServiceProtos_SyncMessage.Groups) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._blob != rhs_storage._blob {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._blob != rhs._blob {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -5593,7 +5165,8 @@ extension SignalServiceProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftPro 9: .same(proto: "width"), 10: .same(proto: "height"), 11: .same(proto: "caption"), - 12: .same(proto: "blurHash") + 12: .same(proto: "blurHash"), + 13: .same(proto: "uploadTimestamp") ] mutating func decodeMessage(decoder: inout D) throws { @@ -5611,6 +5184,7 @@ extension SignalServiceProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftPro case 10: try decoder.decodeSingularUInt32Field(value: &self._height) case 11: try decoder.decodeSingularStringField(value: &self._caption) case 12: try decoder.decodeSingularStringField(value: &self._blurHash) + case 13: try decoder.decodeSingularUInt64Field(value: &self._uploadTimestamp) default: break } } @@ -5653,6 +5227,9 @@ extension SignalServiceProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftPro if let v = self._blurHash { try visitor.visitSingularStringField(value: v, fieldNumber: 12) } + if let v = self._uploadTimestamp { + try visitor.visitSingularUInt64Field(value: v, fieldNumber: 13) + } try unknownFields.traverse(visitor: &visitor) } @@ -5669,6 +5246,7 @@ extension SignalServiceProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftPro if lhs._height != rhs._height {return false} if lhs._caption != rhs._caption {return false} if lhs._blurHash != rhs._blurHash {return false} + if lhs._uploadTimestamp != rhs._uploadTimestamp {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -5691,91 +5269,49 @@ extension SignalServiceProtos_GroupContext: SwiftProtobuf.Message, SwiftProtobuf 6: .same(proto: "members") ] - fileprivate class _StorageClass { - var _id: Data? - var _type: SignalServiceProtos_GroupContext.TypeEnum? - var _name: String? - var _membersE164: [String] = [] - var _avatar: SignalServiceProtos_AttachmentPointer? - var _members: [SignalServiceProtos_GroupContext.Member] = [] - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _id = source._id - _type = source._type - _name = source._name - _membersE164 = source._membersE164 - _avatar = source._avatar - _members = source._members - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularBytesField(value: &_storage._id) - case 2: try decoder.decodeSingularEnumField(value: &_storage._type) - case 3: try decoder.decodeSingularStringField(value: &_storage._name) - case 4: try decoder.decodeRepeatedStringField(value: &_storage._membersE164) - case 5: try decoder.decodeSingularMessageField(value: &_storage._avatar) - case 6: try decoder.decodeRepeatedMessageField(value: &_storage._members) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularBytesField(value: &self._id) + case 2: try decoder.decodeSingularEnumField(value: &self._type) + case 3: try decoder.decodeSingularStringField(value: &self._name) + case 4: try decoder.decodeRepeatedStringField(value: &self.membersE164) + case 5: try decoder.decodeSingularMessageField(value: &self._avatar) + case 6: try decoder.decodeRepeatedMessageField(value: &self.members) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._id { - try visitor.visitSingularBytesField(value: v, fieldNumber: 1) - } - if let v = _storage._type { - try visitor.visitSingularEnumField(value: v, fieldNumber: 2) - } - if let v = _storage._name { - try visitor.visitSingularStringField(value: v, fieldNumber: 3) - } - if !_storage._membersE164.isEmpty { - try visitor.visitRepeatedStringField(value: _storage._membersE164, fieldNumber: 4) - } - if let v = _storage._avatar { - try visitor.visitSingularMessageField(value: v, fieldNumber: 5) - } - if !_storage._members.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._members, fieldNumber: 6) - } + if let v = self._id { + try visitor.visitSingularBytesField(value: v, fieldNumber: 1) + } + if let v = self._type { + try visitor.visitSingularEnumField(value: v, fieldNumber: 2) + } + if let v = self._name { + try visitor.visitSingularStringField(value: v, fieldNumber: 3) + } + if !self.membersE164.isEmpty { + try visitor.visitRepeatedStringField(value: self.membersE164, fieldNumber: 4) + } + if let v = self._avatar { + try visitor.visitSingularMessageField(value: v, fieldNumber: 5) + } + if !self.members.isEmpty { + try visitor.visitRepeatedMessageField(value: self.members, fieldNumber: 6) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_GroupContext, rhs: SignalServiceProtos_GroupContext) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._id != rhs_storage._id {return false} - if _storage._type != rhs_storage._type {return false} - if _storage._name != rhs_storage._name {return false} - if _storage._membersE164 != rhs_storage._membersE164 {return false} - if _storage._avatar != rhs_storage._avatar {return false} - if _storage._members != rhs_storage._members {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._id != rhs._id {return false} + if lhs._type != rhs._type {return false} + if lhs._name != rhs._name {return false} + if lhs.membersE164 != rhs.membersE164 {return false} + if lhs._avatar != rhs._avatar {return false} + if lhs.members != rhs.members {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -5883,126 +5419,74 @@ extension SignalServiceProtos_ContactDetails: SwiftProtobuf.Message, SwiftProtob 11: .same(proto: "archived") ] - fileprivate class _StorageClass { - var _number: String? - var _uuid: String? - var _name: String? - var _avatar: SignalServiceProtos_ContactDetails.Avatar? - var _color: String? - var _verified: SignalServiceProtos_Verified? - var _profileKey: Data? - var _blocked: Bool? - var _expireTimer: UInt32? - var _inboxPosition: UInt32? - var _archived: Bool? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _number = source._number - _uuid = source._uuid - _name = source._name - _avatar = source._avatar - _color = source._color - _verified = source._verified - _profileKey = source._profileKey - _blocked = source._blocked - _expireTimer = source._expireTimer - _inboxPosition = source._inboxPosition - _archived = source._archived - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularStringField(value: &_storage._number) - case 2: try decoder.decodeSingularStringField(value: &_storage._name) - case 3: try decoder.decodeSingularMessageField(value: &_storage._avatar) - case 4: try decoder.decodeSingularStringField(value: &_storage._color) - case 5: try decoder.decodeSingularMessageField(value: &_storage._verified) - case 6: try decoder.decodeSingularBytesField(value: &_storage._profileKey) - case 7: try decoder.decodeSingularBoolField(value: &_storage._blocked) - case 8: try decoder.decodeSingularUInt32Field(value: &_storage._expireTimer) - case 9: try decoder.decodeSingularStringField(value: &_storage._uuid) - case 10: try decoder.decodeSingularUInt32Field(value: &_storage._inboxPosition) - case 11: try decoder.decodeSingularBoolField(value: &_storage._archived) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularStringField(value: &self._number) + case 2: try decoder.decodeSingularStringField(value: &self._name) + case 3: try decoder.decodeSingularMessageField(value: &self._avatar) + case 4: try decoder.decodeSingularStringField(value: &self._color) + case 5: try decoder.decodeSingularMessageField(value: &self._verified) + case 6: try decoder.decodeSingularBytesField(value: &self._profileKey) + case 7: try decoder.decodeSingularBoolField(value: &self._blocked) + case 8: try decoder.decodeSingularUInt32Field(value: &self._expireTimer) + case 9: try decoder.decodeSingularStringField(value: &self._uuid) + case 10: try decoder.decodeSingularUInt32Field(value: &self._inboxPosition) + case 11: try decoder.decodeSingularBoolField(value: &self._archived) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._number { - try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = _storage._name { - try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = _storage._avatar { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } - if let v = _storage._color { - try visitor.visitSingularStringField(value: v, fieldNumber: 4) - } - if let v = _storage._verified { - try visitor.visitSingularMessageField(value: v, fieldNumber: 5) - } - if let v = _storage._profileKey { - try visitor.visitSingularBytesField(value: v, fieldNumber: 6) - } - if let v = _storage._blocked { - try visitor.visitSingularBoolField(value: v, fieldNumber: 7) - } - if let v = _storage._expireTimer { - try visitor.visitSingularUInt32Field(value: v, fieldNumber: 8) - } - if let v = _storage._uuid { - try visitor.visitSingularStringField(value: v, fieldNumber: 9) - } - if let v = _storage._inboxPosition { - try visitor.visitSingularUInt32Field(value: v, fieldNumber: 10) - } - if let v = _storage._archived { - try visitor.visitSingularBoolField(value: v, fieldNumber: 11) - } + if let v = self._number { + try visitor.visitSingularStringField(value: v, fieldNumber: 1) + } + if let v = self._name { + try visitor.visitSingularStringField(value: v, fieldNumber: 2) + } + if let v = self._avatar { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) + } + if let v = self._color { + try visitor.visitSingularStringField(value: v, fieldNumber: 4) + } + if let v = self._verified { + try visitor.visitSingularMessageField(value: v, fieldNumber: 5) + } + if let v = self._profileKey { + try visitor.visitSingularBytesField(value: v, fieldNumber: 6) + } + if let v = self._blocked { + try visitor.visitSingularBoolField(value: v, fieldNumber: 7) + } + if let v = self._expireTimer { + try visitor.visitSingularUInt32Field(value: v, fieldNumber: 8) + } + if let v = self._uuid { + try visitor.visitSingularStringField(value: v, fieldNumber: 9) + } + if let v = self._inboxPosition { + try visitor.visitSingularUInt32Field(value: v, fieldNumber: 10) + } + if let v = self._archived { + try visitor.visitSingularBoolField(value: v, fieldNumber: 11) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_ContactDetails, rhs: SignalServiceProtos_ContactDetails) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._number != rhs_storage._number {return false} - if _storage._uuid != rhs_storage._uuid {return false} - if _storage._name != rhs_storage._name {return false} - if _storage._avatar != rhs_storage._avatar {return false} - if _storage._color != rhs_storage._color {return false} - if _storage._verified != rhs_storage._verified {return false} - if _storage._profileKey != rhs_storage._profileKey {return false} - if _storage._blocked != rhs_storage._blocked {return false} - if _storage._expireTimer != rhs_storage._expireTimer {return false} - if _storage._inboxPosition != rhs_storage._inboxPosition {return false} - if _storage._archived != rhs_storage._archived {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._number != rhs._number {return false} + if lhs._uuid != rhs._uuid {return false} + if lhs._name != rhs._name {return false} + if lhs._avatar != rhs._avatar {return false} + if lhs._color != rhs._color {return false} + if lhs._verified != rhs._verified {return false} + if lhs._profileKey != rhs._profileKey {return false} + if lhs._blocked != rhs._blocked {return false} + if lhs._expireTimer != rhs._expireTimer {return false} + if lhs._inboxPosition != rhs._inboxPosition {return false} + if lhs._archived != rhs._archived {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -6059,126 +5543,74 @@ extension SignalServiceProtos_GroupDetails: SwiftProtobuf.Message, SwiftProtobuf 11: .same(proto: "archived") ] - fileprivate class _StorageClass { - var _id: Data? - var _name: String? - var _membersE164: [String] = [] - var _avatar: SignalServiceProtos_GroupDetails.Avatar? - var _active: Bool? - var _expireTimer: UInt32? - var _color: String? - var _blocked: Bool? - var _members: [SignalServiceProtos_GroupDetails.Member] = [] - var _inboxPosition: UInt32? - var _archived: Bool? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _id = source._id - _name = source._name - _membersE164 = source._membersE164 - _avatar = source._avatar - _active = source._active - _expireTimer = source._expireTimer - _color = source._color - _blocked = source._blocked - _members = source._members - _inboxPosition = source._inboxPosition - _archived = source._archived - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularBytesField(value: &_storage._id) - case 2: try decoder.decodeSingularStringField(value: &_storage._name) - case 3: try decoder.decodeRepeatedStringField(value: &_storage._membersE164) - case 4: try decoder.decodeSingularMessageField(value: &_storage._avatar) - case 5: try decoder.decodeSingularBoolField(value: &_storage._active) - case 6: try decoder.decodeSingularUInt32Field(value: &_storage._expireTimer) - case 7: try decoder.decodeSingularStringField(value: &_storage._color) - case 8: try decoder.decodeSingularBoolField(value: &_storage._blocked) - case 9: try decoder.decodeRepeatedMessageField(value: &_storage._members) - case 10: try decoder.decodeSingularUInt32Field(value: &_storage._inboxPosition) - case 11: try decoder.decodeSingularBoolField(value: &_storage._archived) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularBytesField(value: &self._id) + case 2: try decoder.decodeSingularStringField(value: &self._name) + case 3: try decoder.decodeRepeatedStringField(value: &self.membersE164) + case 4: try decoder.decodeSingularMessageField(value: &self._avatar) + case 5: try decoder.decodeSingularBoolField(value: &self._active) + case 6: try decoder.decodeSingularUInt32Field(value: &self._expireTimer) + case 7: try decoder.decodeSingularStringField(value: &self._color) + case 8: try decoder.decodeSingularBoolField(value: &self._blocked) + case 9: try decoder.decodeRepeatedMessageField(value: &self.members) + case 10: try decoder.decodeSingularUInt32Field(value: &self._inboxPosition) + case 11: try decoder.decodeSingularBoolField(value: &self._archived) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._id { - try visitor.visitSingularBytesField(value: v, fieldNumber: 1) - } - if let v = _storage._name { - try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if !_storage._membersE164.isEmpty { - try visitor.visitRepeatedStringField(value: _storage._membersE164, fieldNumber: 3) - } - if let v = _storage._avatar { - try visitor.visitSingularMessageField(value: v, fieldNumber: 4) - } - if let v = _storage._active { - try visitor.visitSingularBoolField(value: v, fieldNumber: 5) - } - if let v = _storage._expireTimer { - try visitor.visitSingularUInt32Field(value: v, fieldNumber: 6) - } - if let v = _storage._color { - try visitor.visitSingularStringField(value: v, fieldNumber: 7) - } - if let v = _storage._blocked { - try visitor.visitSingularBoolField(value: v, fieldNumber: 8) - } - if !_storage._members.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._members, fieldNumber: 9) - } - if let v = _storage._inboxPosition { - try visitor.visitSingularUInt32Field(value: v, fieldNumber: 10) - } - if let v = _storage._archived { - try visitor.visitSingularBoolField(value: v, fieldNumber: 11) - } + if let v = self._id { + try visitor.visitSingularBytesField(value: v, fieldNumber: 1) + } + if let v = self._name { + try visitor.visitSingularStringField(value: v, fieldNumber: 2) + } + if !self.membersE164.isEmpty { + try visitor.visitRepeatedStringField(value: self.membersE164, fieldNumber: 3) + } + if let v = self._avatar { + try visitor.visitSingularMessageField(value: v, fieldNumber: 4) + } + if let v = self._active { + try visitor.visitSingularBoolField(value: v, fieldNumber: 5) + } + if let v = self._expireTimer { + try visitor.visitSingularUInt32Field(value: v, fieldNumber: 6) + } + if let v = self._color { + try visitor.visitSingularStringField(value: v, fieldNumber: 7) + } + if let v = self._blocked { + try visitor.visitSingularBoolField(value: v, fieldNumber: 8) + } + if !self.members.isEmpty { + try visitor.visitRepeatedMessageField(value: self.members, fieldNumber: 9) + } + if let v = self._inboxPosition { + try visitor.visitSingularUInt32Field(value: v, fieldNumber: 10) + } + if let v = self._archived { + try visitor.visitSingularBoolField(value: v, fieldNumber: 11) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_GroupDetails, rhs: SignalServiceProtos_GroupDetails) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._id != rhs_storage._id {return false} - if _storage._name != rhs_storage._name {return false} - if _storage._membersE164 != rhs_storage._membersE164 {return false} - if _storage._avatar != rhs_storage._avatar {return false} - if _storage._active != rhs_storage._active {return false} - if _storage._expireTimer != rhs_storage._expireTimer {return false} - if _storage._color != rhs_storage._color {return false} - if _storage._blocked != rhs_storage._blocked {return false} - if _storage._members != rhs_storage._members {return false} - if _storage._inboxPosition != rhs_storage._inboxPosition {return false} - if _storage._archived != rhs_storage._archived {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._id != rhs._id {return false} + if lhs._name != rhs._name {return false} + if lhs.membersE164 != rhs.membersE164 {return false} + if lhs._avatar != rhs._avatar {return false} + if lhs._active != rhs._active {return false} + if lhs._expireTimer != rhs._expireTimer {return false} + if lhs._color != rhs._color {return false} + if lhs._blocked != rhs._blocked {return false} + if lhs.members != rhs.members {return false} + if lhs._inboxPosition != rhs._inboxPosition {return false} + if lhs._archived != rhs._archived {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -6263,77 +5695,39 @@ extension SignalServiceProtos_Pack: SwiftProtobuf.Message, SwiftProtobuf._Messag 4: .same(proto: "stickers") ] - fileprivate class _StorageClass { - var _title: String? - var _author: String? - var _cover: SignalServiceProtos_Pack.Sticker? - var _stickers: [SignalServiceProtos_Pack.Sticker] = [] - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _title = source._title - _author = source._author - _cover = source._cover - _stickers = source._stickers - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularStringField(value: &_storage._title) - case 2: try decoder.decodeSingularStringField(value: &_storage._author) - case 3: try decoder.decodeSingularMessageField(value: &_storage._cover) - case 4: try decoder.decodeRepeatedMessageField(value: &_storage._stickers) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularStringField(value: &self._title) + case 2: try decoder.decodeSingularStringField(value: &self._author) + case 3: try decoder.decodeSingularMessageField(value: &self._cover) + case 4: try decoder.decodeRepeatedMessageField(value: &self.stickers) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._title { - try visitor.visitSingularStringField(value: v, fieldNumber: 1) - } - if let v = _storage._author { - try visitor.visitSingularStringField(value: v, fieldNumber: 2) - } - if let v = _storage._cover { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } - if !_storage._stickers.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._stickers, fieldNumber: 4) - } + if let v = self._title { + try visitor.visitSingularStringField(value: v, fieldNumber: 1) + } + if let v = self._author { + try visitor.visitSingularStringField(value: v, fieldNumber: 2) + } + if let v = self._cover { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) + } + if !self.stickers.isEmpty { + try visitor.visitRepeatedMessageField(value: self.stickers, fieldNumber: 4) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: SignalServiceProtos_Pack, rhs: SignalServiceProtos_Pack) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._title != rhs_storage._title {return false} - if _storage._author != rhs_storage._author {return false} - if _storage._cover != rhs_storage._cover {return false} - if _storage._stickers != rhs_storage._stickers {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._title != rhs._title {return false} + if lhs._author != rhs._author {return false} + if lhs._cover != rhs._cover {return false} + if lhs.stickers != rhs.stickers {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } diff --git a/SignalServiceKit/src/Protos/Generated/StorageService.pb.swift b/SignalServiceKit/src/Protos/Generated/StorageService.pb.swift index 01553e4c7b..e188f73fd8 100644 --- a/SignalServiceKit/src/Protos/Generated/StorageService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/StorageService.pb.swift @@ -11,7 +11,7 @@ import SwiftProtobuf // If the compiler emits an error on this type, it is because this file // was generated by a version of the `protoc` Swift plug-in that is // incompatible with the version of SwiftProtobuf to which you are linking. -// Please ensure that your are building against the same version of the API +// Please ensure that you are building against the same version of the API // that was used to generate this file. private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} @@ -81,34 +81,25 @@ struct StorageServiceProtos_WriteOperation { // methods supported on all messages. var manifest: StorageServiceProtos_StorageManifest { - get {return _storage._manifest ?? StorageServiceProtos_StorageManifest()} - set {_uniqueStorage()._manifest = newValue} + get {return _manifest ?? StorageServiceProtos_StorageManifest()} + set {_manifest = newValue} } /// Returns true if `manifest` has been explicitly set. - var hasManifest: Bool {return _storage._manifest != nil} + var hasManifest: Bool {return self._manifest != nil} /// Clears the value of `manifest`. Subsequent reads from it will return its default value. - mutating func clearManifest() {_uniqueStorage()._manifest = nil} + mutating func clearManifest() {self._manifest = nil} - var insertItem: [StorageServiceProtos_StorageItem] { - get {return _storage._insertItem} - set {_uniqueStorage()._insertItem = newValue} - } + var insertItem: [StorageServiceProtos_StorageItem] = [] - var deleteKey: [Data] { - get {return _storage._deleteKey} - set {_uniqueStorage()._deleteKey = newValue} - } + var deleteKey: [Data] = [] - var deleteAll: Bool { - get {return _storage._deleteAll} - set {_uniqueStorage()._deleteAll = newValue} - } + var deleteAll: Bool = false var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _manifest: StorageServiceProtos_StorageManifest? } struct StorageServiceProtos_ManifestRecord { @@ -179,46 +170,58 @@ struct StorageServiceProtos_ManifestRecord { init() {} } +#if swift(>=4.2) + +extension StorageServiceProtos_ManifestRecord.Key.TypeEnum: CaseIterable { + // The compiler won't synthesize support with the UNRECOGNIZED case. + static var allCases: [StorageServiceProtos_ManifestRecord.Key.TypeEnum] = [ + .unknown, + .contact, + .groupv1, + .groupv2, + .account + ] +} + +#endif // swift(>=4.2) + struct StorageServiceProtos_StorageRecord { // 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 record: OneOf_Record? { - get {return _storage._record} - set {_uniqueStorage()._record = newValue} - } + var record: StorageServiceProtos_StorageRecord.OneOf_Record? var contact: StorageServiceProtos_ContactRecord { get { - if case .contact(let v)? = _storage._record {return v} + if case .contact(let v)? = record {return v} return StorageServiceProtos_ContactRecord() } - set {_uniqueStorage()._record = .contact(newValue)} + set {record = .contact(newValue)} } var groupV1: StorageServiceProtos_GroupV1Record { get { - if case .groupV1(let v)? = _storage._record {return v} + if case .groupV1(let v)? = record {return v} return StorageServiceProtos_GroupV1Record() } - set {_uniqueStorage()._record = .groupV1(newValue)} + set {record = .groupV1(newValue)} } var groupV2: StorageServiceProtos_GroupV2Record { get { - if case .groupV2(let v)? = _storage._record {return v} + if case .groupV2(let v)? = record {return v} return StorageServiceProtos_GroupV2Record() } - set {_uniqueStorage()._record = .groupV2(newValue)} + set {record = .groupV2(newValue)} } var account: StorageServiceProtos_AccountRecord { get { - if case .account(let v)? = _storage._record {return v} + if case .account(let v)? = record {return v} return StorageServiceProtos_AccountRecord() } - set {_uniqueStorage()._record = .account(newValue)} + set {record = .account(newValue)} } var unknownFields = SwiftProtobuf.UnknownStorage() @@ -243,8 +246,6 @@ struct StorageServiceProtos_StorageRecord { } init() {} - - fileprivate var _storage = _StorageClass.defaultInstance } struct StorageServiceProtos_ContactRecord { @@ -530,77 +531,39 @@ extension StorageServiceProtos_WriteOperation: SwiftProtobuf.Message, SwiftProto 4: .same(proto: "deleteAll") ] - fileprivate class _StorageClass { - var _manifest: StorageServiceProtos_StorageManifest? - var _insertItem: [StorageServiceProtos_StorageItem] = [] - var _deleteKey: [Data] = [] - var _deleteAll: Bool = false - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _manifest = source._manifest - _insertItem = source._insertItem - _deleteKey = source._deleteKey - _deleteAll = source._deleteAll - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularMessageField(value: &_storage._manifest) - case 2: try decoder.decodeRepeatedMessageField(value: &_storage._insertItem) - case 3: try decoder.decodeRepeatedBytesField(value: &_storage._deleteKey) - case 4: try decoder.decodeSingularBoolField(value: &_storage._deleteAll) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: try decoder.decodeSingularMessageField(value: &self._manifest) + case 2: try decoder.decodeRepeatedMessageField(value: &self.insertItem) + case 3: try decoder.decodeRepeatedBytesField(value: &self.deleteKey) + case 4: try decoder.decodeSingularBoolField(value: &self.deleteAll) + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._manifest { - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - } - if !_storage._insertItem.isEmpty { - try visitor.visitRepeatedMessageField(value: _storage._insertItem, fieldNumber: 2) - } - if !_storage._deleteKey.isEmpty { - try visitor.visitRepeatedBytesField(value: _storage._deleteKey, fieldNumber: 3) - } - if _storage._deleteAll != false { - try visitor.visitSingularBoolField(value: _storage._deleteAll, fieldNumber: 4) - } + if let v = self._manifest { + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + } + if !self.insertItem.isEmpty { + try visitor.visitRepeatedMessageField(value: self.insertItem, fieldNumber: 2) + } + if !self.deleteKey.isEmpty { + try visitor.visitRepeatedBytesField(value: self.deleteKey, fieldNumber: 3) + } + if self.deleteAll != false { + try visitor.visitSingularBoolField(value: self.deleteAll, fieldNumber: 4) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: StorageServiceProtos_WriteOperation, rhs: StorageServiceProtos_WriteOperation) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._manifest != rhs_storage._manifest {return false} - if _storage._insertItem != rhs_storage._insertItem {return false} - if _storage._deleteKey != rhs_storage._deleteKey {return false} - if _storage._deleteAll != rhs_storage._deleteAll {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._manifest != rhs._manifest {return false} + if lhs.insertItem != rhs.insertItem {return false} + if lhs.deleteKey != rhs.deleteKey {return false} + if lhs.deleteAll != rhs.deleteAll {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } @@ -695,95 +658,63 @@ extension StorageServiceProtos_StorageRecord: SwiftProtobuf.Message, SwiftProtob 4: .same(proto: "account") ] - fileprivate class _StorageClass { - var _record: StorageServiceProtos_StorageRecord.OneOf_Record? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _record = source._record - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: - var v: StorageServiceProtos_ContactRecord? - if let current = _storage._record { - try decoder.handleConflictingOneOf() - if case .contact(let m) = current {v = m} - } - try decoder.decodeSingularMessageField(value: &v) - if let v = v {_storage._record = .contact(v)} - case 2: - var v: StorageServiceProtos_GroupV1Record? - if let current = _storage._record { - try decoder.handleConflictingOneOf() - if case .groupV1(let m) = current {v = m} - } - try decoder.decodeSingularMessageField(value: &v) - if let v = v {_storage._record = .groupV1(v)} - case 3: - var v: StorageServiceProtos_GroupV2Record? - if let current = _storage._record { - try decoder.handleConflictingOneOf() - if case .groupV2(let m) = current {v = m} - } - try decoder.decodeSingularMessageField(value: &v) - if let v = v {_storage._record = .groupV2(v)} - case 4: - var v: StorageServiceProtos_AccountRecord? - if let current = _storage._record { - try decoder.handleConflictingOneOf() - if case .account(let m) = current {v = m} - } - try decoder.decodeSingularMessageField(value: &v) - if let v = v {_storage._record = .account(v)} - default: break + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + case 1: + var v: StorageServiceProtos_ContactRecord? + if let current = self.record { + try decoder.handleConflictingOneOf() + if case .contact(let m) = current {v = m} } + try decoder.decodeSingularMessageField(value: &v) + if let v = v {self.record = .contact(v)} + case 2: + var v: StorageServiceProtos_GroupV1Record? + if let current = self.record { + try decoder.handleConflictingOneOf() + if case .groupV1(let m) = current {v = m} + } + try decoder.decodeSingularMessageField(value: &v) + if let v = v {self.record = .groupV1(v)} + case 3: + var v: StorageServiceProtos_GroupV2Record? + if let current = self.record { + try decoder.handleConflictingOneOf() + if case .groupV2(let m) = current {v = m} + } + try decoder.decodeSingularMessageField(value: &v) + if let v = v {self.record = .groupV2(v)} + case 4: + var v: StorageServiceProtos_AccountRecord? + if let current = self.record { + try decoder.handleConflictingOneOf() + if case .account(let m) = current {v = m} + } + try decoder.decodeSingularMessageField(value: &v) + if let v = v {self.record = .account(v)} + default: break } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - switch _storage._record { - case .contact(let v)?: - try visitor.visitSingularMessageField(value: v, fieldNumber: 1) - case .groupV1(let v)?: - try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - case .groupV2(let v)?: - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - case .account(let v)?: - try visitor.visitSingularMessageField(value: v, fieldNumber: 4) - case nil: break - } + switch self.record { + case .contact(let v)?: + try visitor.visitSingularMessageField(value: v, fieldNumber: 1) + case .groupV1(let v)?: + try visitor.visitSingularMessageField(value: v, fieldNumber: 2) + case .groupV2(let v)?: + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) + case .account(let v)?: + try visitor.visitSingularMessageField(value: v, fieldNumber: 4) + case nil: break } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: StorageServiceProtos_StorageRecord, rhs: StorageServiceProtos_StorageRecord) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._record != rhs_storage._record {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs.record != rhs.record {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true } diff --git a/SignalServiceKit/src/Protos/Generated/WebSocketResources.pb.swift b/SignalServiceKit/src/Protos/Generated/WebSocketResources.pb.swift index fb784c3351..4e4d019bf2 100644 --- a/SignalServiceKit/src/Protos/Generated/WebSocketResources.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/WebSocketResources.pb.swift @@ -16,7 +16,7 @@ import SwiftProtobuf // If the compiler emits an error on this type, it is because this file // was generated by a version of the `protoc` Swift plug-in that is // incompatible with the version of SwiftProtobuf to which you are linking. -// Please ensure that your are building against the same version of the API +// Please ensure that you are building against the same version of the API // that was used to generate this file. private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} @@ -140,31 +140,31 @@ struct WebSocketProtos_WebSocketMessage { // methods supported on all messages. var type: WebSocketProtos_WebSocketMessage.TypeEnum { - get {return _storage._type ?? .unknown} - set {_uniqueStorage()._type = newValue} + get {return _type ?? .unknown} + set {_type = newValue} } /// Returns true if `type` has been explicitly set. - var hasType: Bool {return _storage._type != nil} + var hasType: Bool {return self._type != nil} /// Clears the value of `type`. Subsequent reads from it will return its default value. - mutating func clearType() {_uniqueStorage()._type = nil} + mutating func clearType() {self._type = nil} var request: WebSocketProtos_WebSocketRequestMessage { - get {return _storage._request ?? WebSocketProtos_WebSocketRequestMessage()} - set {_uniqueStorage()._request = newValue} + get {return _request ?? WebSocketProtos_WebSocketRequestMessage()} + set {_request = newValue} } /// Returns true if `request` has been explicitly set. - var hasRequest: Bool {return _storage._request != nil} + var hasRequest: Bool {return self._request != nil} /// Clears the value of `request`. Subsequent reads from it will return its default value. - mutating func clearRequest() {_uniqueStorage()._request = nil} + mutating func clearRequest() {self._request = nil} var response: WebSocketProtos_WebSocketResponseMessage { - get {return _storage._response ?? WebSocketProtos_WebSocketResponseMessage()} - set {_uniqueStorage()._response = newValue} + get {return _response ?? WebSocketProtos_WebSocketResponseMessage()} + set {_response = newValue} } /// Returns true if `response` has been explicitly set. - var hasResponse: Bool {return _storage._response != nil} + var hasResponse: Bool {return self._response != nil} /// Clears the value of `response`. Subsequent reads from it will return its default value. - mutating func clearResponse() {_uniqueStorage()._response = nil} + mutating func clearResponse() {self._response = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -199,7 +199,9 @@ struct WebSocketProtos_WebSocketMessage { init() {} - fileprivate var _storage = _StorageClass.defaultInstance + fileprivate var _type: WebSocketProtos_WebSocketMessage.TypeEnum? + fileprivate var _request: WebSocketProtos_WebSocketRequestMessage? + fileprivate var _response: WebSocketProtos_WebSocketResponseMessage? } #if swift(>=4.2) @@ -328,70 +330,34 @@ extension WebSocketProtos_WebSocketMessage: SwiftProtobuf.Message, SwiftProtobuf 3: .same(proto: "response") ] - fileprivate class _StorageClass { - var _type: WebSocketProtos_WebSocketMessage.TypeEnum? - var _request: WebSocketProtos_WebSocketRequestMessage? - var _response: WebSocketProtos_WebSocketResponseMessage? - - static let defaultInstance = _StorageClass() - - private init() {} - - init(copying source: _StorageClass) { - _type = source._type - _request = source._request - _response = source._response - } - } - - fileprivate mutating func _uniqueStorage() -> _StorageClass { - if !isKnownUniquelyReferenced(&_storage) { - _storage = _StorageClass(copying: _storage) - } - return _storage - } - mutating func decodeMessage(decoder: inout D) throws { - _ = _uniqueStorage() - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - while let fieldNumber = try decoder.nextFieldNumber() { - switch fieldNumber { - case 1: try decoder.decodeSingularEnumField(value: &_storage._type) - case 2: try decoder.decodeSingularMessageField(value: &_storage._request) - case 3: try decoder.decodeSingularMessageField(value: &_storage._response) - default: break - } + while let fieldNumber = try decoder.nextFieldNumber() { + switch fieldNumber { + 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 } } } func traverse(visitor: inout V) throws { - try withExtendedLifetime(_storage) { (_storage: _StorageClass) in - if let v = _storage._type { - try visitor.visitSingularEnumField(value: v, fieldNumber: 1) - } - if let v = _storage._request { - try visitor.visitSingularMessageField(value: v, fieldNumber: 2) - } - if let v = _storage._response { - try visitor.visitSingularMessageField(value: v, fieldNumber: 3) - } + if let v = self._type { + try visitor.visitSingularEnumField(value: v, fieldNumber: 1) + } + if let v = self._request { + try visitor.visitSingularMessageField(value: v, fieldNumber: 2) + } + if let v = self._response { + try visitor.visitSingularMessageField(value: v, fieldNumber: 3) } try unknownFields.traverse(visitor: &visitor) } static func ==(lhs: WebSocketProtos_WebSocketMessage, rhs: WebSocketProtos_WebSocketMessage) -> Bool { - if lhs._storage !== rhs._storage { - let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in - let _storage = _args.0 - let rhs_storage = _args.1 - if _storage._type != rhs_storage._type {return false} - if _storage._request != rhs_storage._request {return false} - if _storage._response != rhs_storage._response {return false} - return true - } - if !storagesAreEqual {return false} - } + if lhs._type != rhs._type {return false} + if lhs._request != rhs._request {return false} + if lhs._response != rhs._response {return false} if lhs.unknownFields != rhs.unknownFields {return false} return true }