From 01b1df5375c753bade3fd1d2ea85bc1dbca8f34e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 21 Feb 2019 11:02:55 -0500 Subject: [PATCH] Add 'is update' flag to 'sent message' transcript proto schema. --- SignalServiceKit/protobuf/SignalService.proto | 2 +- .../src/Protos/Generated/SSKProto.swift | 16 ++++++------ .../Protos/Generated/SignalService.pb.swift | 26 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto index 4c5ccaadf..8269f38ec 100644 --- a/SignalServiceKit/protobuf/SignalService.proto +++ b/SignalServiceKit/protobuf/SignalService.proto @@ -265,7 +265,7 @@ message SyncMessage { optional DataMessage message = 3; optional uint64 expirationStartTimestamp = 4; repeated UnidentifiedDeliveryStatus unidentifiedStatus = 5; - optional bool isUpdate = 6 [default = false]; + optional bool isRecipientUpdate = 6 [default = false]; } message Contacts { diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index cd1cacd2f..af4c2e52b 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -3602,8 +3602,8 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS builder.setExpirationStartTimestamp(expirationStartTimestamp) } builder.setUnidentifiedStatus(unidentifiedStatus) - if hasIsUpdate { - builder.setIsUpdate(isUpdate) + if hasIsRecipientUpdate { + builder.setIsRecipientUpdate(isRecipientUpdate) } return builder } @@ -3640,8 +3640,8 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS proto.unidentifiedStatus = wrappedItems.map { $0.proto } } - @objc public func setIsUpdate(_ valueParam: Bool) { - proto.isUpdate = valueParam + @objc public func setIsRecipientUpdate(_ valueParam: Bool) { + proto.isRecipientUpdate = valueParam } @objc public func build() throws -> SSKProtoSyncMessageSent { @@ -3683,11 +3683,11 @@ extension SSKProtoSyncMessageSentUnidentifiedDeliveryStatus.SSKProtoSyncMessageS return proto.hasExpirationStartTimestamp } - @objc public var isUpdate: Bool { - return proto.isUpdate + @objc public var isRecipientUpdate: Bool { + return proto.isRecipientUpdate } - @objc public var hasIsUpdate: Bool { - return proto.hasIsUpdate + @objc public var hasIsRecipientUpdate: Bool { + return proto.hasIsRecipientUpdate } private init(proto: SignalServiceProtos_SyncMessage.Sent, diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift index ad5bb91b0..b023dec52 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift @@ -1568,14 +1568,14 @@ struct SignalServiceProtos_SyncMessage { set {_uniqueStorage()._unidentifiedStatus = newValue} } - var isUpdate: Bool { - get {return _storage._isUpdate ?? false} - set {_uniqueStorage()._isUpdate = newValue} + var isRecipientUpdate: Bool { + get {return _storage._isRecipientUpdate ?? false} + set {_uniqueStorage()._isRecipientUpdate = newValue} } - /// Returns true if `isUpdate` has been explicitly set. - var hasIsUpdate: Bool {return _storage._isUpdate != nil} - /// Clears the value of `isUpdate`. Subsequent reads from it will return its default value. - mutating func clearIsUpdate() {_uniqueStorage()._isUpdate = nil} + /// Returns true if `isRecipientUpdate` has been explicitly set. + var hasIsRecipientUpdate: Bool {return _storage._isRecipientUpdate != nil} + /// Clears the value of `isRecipientUpdate`. Subsequent reads from it will return its default value. + mutating func clearIsRecipientUpdate() {_uniqueStorage()._isRecipientUpdate = nil} var unknownFields = SwiftProtobuf.UnknownStorage() @@ -3853,7 +3853,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt 3: .same(proto: "message"), 4: .same(proto: "expirationStartTimestamp"), 5: .same(proto: "unidentifiedStatus"), - 6: .same(proto: "isUpdate"), + 6: .same(proto: "isRecipientUpdate"), ] fileprivate class _StorageClass { @@ -3862,7 +3862,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt var _message: SignalServiceProtos_DataMessage? = nil var _expirationStartTimestamp: UInt64? = nil var _unidentifiedStatus: [SignalServiceProtos_SyncMessage.Sent.UnidentifiedDeliveryStatus] = [] - var _isUpdate: Bool? = nil + var _isRecipientUpdate: Bool? = nil static let defaultInstance = _StorageClass() @@ -3874,7 +3874,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt _message = source._message _expirationStartTimestamp = source._expirationStartTimestamp _unidentifiedStatus = source._unidentifiedStatus - _isUpdate = source._isUpdate + _isRecipientUpdate = source._isRecipientUpdate } } @@ -3895,7 +3895,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt case 3: try decoder.decodeSingularMessageField(value: &_storage._message) case 4: try decoder.decodeSingularUInt64Field(value: &_storage._expirationStartTimestamp) case 5: try decoder.decodeRepeatedMessageField(value: &_storage._unidentifiedStatus) - case 6: try decoder.decodeSingularBoolField(value: &_storage._isUpdate) + case 6: try decoder.decodeSingularBoolField(value: &_storage._isRecipientUpdate) default: break } } @@ -3919,7 +3919,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt if !_storage._unidentifiedStatus.isEmpty { try visitor.visitRepeatedMessageField(value: _storage._unidentifiedStatus, fieldNumber: 5) } - if let v = _storage._isUpdate { + if let v = _storage._isRecipientUpdate { try visitor.visitSingularBoolField(value: v, fieldNumber: 6) } } @@ -3936,7 +3936,7 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt if _storage._message != rhs_storage._message {return false} if _storage._expirationStartTimestamp != rhs_storage._expirationStartTimestamp {return false} if _storage._unidentifiedStatus != rhs_storage._unidentifiedStatus {return false} - if _storage._isUpdate != rhs_storage._isUpdate {return false} + if _storage._isRecipientUpdate != rhs_storage._isRecipientUpdate {return false} return true } if !storagesAreEqual {return false}