diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto index 1274a7b48..afb9170ba 100644 --- a/SignalServiceKit/protobuf/SignalService.proto +++ b/SignalServiceKit/protobuf/SignalService.proto @@ -269,6 +269,7 @@ message SyncMessage { message SentUpdate { message UnidentifiedDeliveryStatus { + // @required optional string destination = 1; optional bool unidentified = 2; } diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index 412867092..96a68f7bd 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -3740,16 +3740,13 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { // MARK: - SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder - @objc public class func builder() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { - return SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder() + @objc public class func builder(destination: String) -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { + return SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder(destination: destination) } // asBuilder() constructs a builder that reflects the proto's contents. @objc public func asBuilder() -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder { - let builder = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder() - if let _value = destination { - builder.setDestination(_value) - } + let builder = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatusBuilder(destination: destination) if hasUnidentified { builder.setUnidentified(unidentified) } @@ -3762,6 +3759,12 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { @objc fileprivate override init() {} + @objc fileprivate init(destination: String) { + super.init() + + setDestination(destination) + } + @objc public func setDestination(_ valueParam: String) { proto.destination = valueParam } @@ -3781,15 +3784,7 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { fileprivate let proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus - @objc public var destination: String? { - guard proto.hasDestination else { - return nil - } - return proto.destination - } - @objc public var hasDestination: Bool { - return proto.hasDestination - } + @objc public let destination: String @objc public var unidentified: Bool { return proto.unidentified @@ -3798,8 +3793,10 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { return proto.hasUnidentified } - private init(proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) { + private init(proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus, + destination: String) { self.proto = proto + self.destination = destination } @objc @@ -3813,11 +3810,17 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { } fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.SentUpdate.UnidentifiedDeliveryStatus) throws -> SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus { + guard proto.hasDestination else { + throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: destination") + } + let destination = proto.destination + // MARK: - Begin Validation Logic for SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - // MARK: - End Validation Logic for SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus - - let result = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus(proto: proto) + let result = SSKProtoSyncMessageSentUpdateUnidentifiedDeliveryStatus(proto: proto, + destination: destination) return result } diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift index 7cb550360..b40305e1c 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift @@ -1649,6 +1649,7 @@ struct SignalServiceProtos_SyncMessage { // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. + /// @required var destination: String { get {return _destination ?? String()} set {_destination = newValue}