From 814375c48838440fc7febb2d83cfc7926ae0e9df Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 30 Jul 2021 15:15:27 +1000 Subject: [PATCH] Update protos --- .../Protos/Generated/SNProto.swift | 111 ++++++++++++++++++ .../Protos/Generated/SessionProtos.pb.swift | 70 +++++++++++ .../Protos/SessionProtos.proto | 7 +- 3 files changed, 187 insertions(+), 1 deletion(-) diff --git a/SessionMessagingKit/Protos/Generated/SNProto.swift b/SessionMessagingKit/Protos/Generated/SNProto.swift index d5a422e45..a911f2629 100644 --- a/SessionMessagingKit/Protos/Generated/SNProto.swift +++ b/SessionMessagingKit/Protos/Generated/SNProto.swift @@ -2813,6 +2813,100 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr #endif +// MARK: - SNProtoDataMessageGroupCallUpdate + +@objc public class SNProtoDataMessageGroupCallUpdate: NSObject { + + // MARK: - SNProtoDataMessageGroupCallUpdateBuilder + + @objc public class func builder() -> SNProtoDataMessageGroupCallUpdateBuilder { + return SNProtoDataMessageGroupCallUpdateBuilder() + } + + // asBuilder() constructs a builder that reflects the proto's contents. + @objc public func asBuilder() -> SNProtoDataMessageGroupCallUpdateBuilder { + let builder = SNProtoDataMessageGroupCallUpdateBuilder() + if let _value = eraID { + builder.setEraID(_value) + } + return builder + } + + @objc public class SNProtoDataMessageGroupCallUpdateBuilder: NSObject { + + private var proto = SessionProtos_DataMessage.GroupCallUpdate() + + @objc fileprivate override init() {} + + @objc public func setEraID(_ valueParam: String) { + proto.eraID = valueParam + } + + @objc public func build() throws -> SNProtoDataMessageGroupCallUpdate { + return try SNProtoDataMessageGroupCallUpdate.parseProto(proto) + } + + @objc public func buildSerializedData() throws -> Data { + return try SNProtoDataMessageGroupCallUpdate.parseProto(proto).serializedData() + } + } + + fileprivate let proto: SessionProtos_DataMessage.GroupCallUpdate + + @objc public var eraID: String? { + guard proto.hasEraID else { + return nil + } + return proto.eraID + } + @objc public var hasEraID: Bool { + return proto.hasEraID + } + + private init(proto: SessionProtos_DataMessage.GroupCallUpdate) { + self.proto = proto + } + + @objc + public func serializedData() throws -> Data { + return try self.proto.serializedData() + } + + @objc public class func parseData(_ serializedData: Data) throws -> SNProtoDataMessageGroupCallUpdate { + let proto = try SessionProtos_DataMessage.GroupCallUpdate(serializedData: serializedData) + return try parseProto(proto) + } + + fileprivate class func parseProto(_ proto: SessionProtos_DataMessage.GroupCallUpdate) throws -> SNProtoDataMessageGroupCallUpdate { + // MARK: - Begin Validation Logic for SNProtoDataMessageGroupCallUpdate - + + // MARK: - End Validation Logic for SNProtoDataMessageGroupCallUpdate - + + let result = SNProtoDataMessageGroupCallUpdate(proto: proto) + return result + } + + @objc public override var debugDescription: String { + return "\(proto)" + } +} + +#if DEBUG + +extension SNProtoDataMessageGroupCallUpdate { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SNProtoDataMessageGroupCallUpdate.SNProtoDataMessageGroupCallUpdateBuilder { + @objc public func buildIgnoringErrors() -> SNProtoDataMessageGroupCallUpdate? { + return try! self.build() + } +} + +#endif + // MARK: - SNProtoDataMessage @objc public class SNProtoDataMessage: NSObject { @@ -2867,6 +2961,9 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr builder.setQuote(_value) } builder.setPreview(preview) + if let _value = groupCallUpdate { + builder.setGroupCallUpdate(_value) + } if let _value = profile { builder.setProfile(_value) } @@ -2936,6 +3033,10 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr proto.preview = wrappedItems.map { $0.proto } } + @objc public func setGroupCallUpdate(_ valueParam: SNProtoDataMessageGroupCallUpdate) { + proto.groupCallUpdate = valueParam.proto + } + @objc public func setProfile(_ valueParam: SNProtoDataMessageLokiProfile) { proto.profile = valueParam.proto } @@ -2971,6 +3072,8 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr @objc public let preview: [SNProtoDataMessagePreview] + @objc public let groupCallUpdate: SNProtoDataMessageGroupCallUpdate? + @objc public let profile: SNProtoDataMessageLokiProfile? @objc public let openGroupInvitation: SNProtoDataMessageOpenGroupInvitation? @@ -3033,6 +3136,7 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr group: SNProtoGroupContext?, quote: SNProtoDataMessageQuote?, preview: [SNProtoDataMessagePreview], + groupCallUpdate: SNProtoDataMessageGroupCallUpdate?, profile: SNProtoDataMessageLokiProfile?, openGroupInvitation: SNProtoDataMessageOpenGroupInvitation?, closedGroupControlMessage: SNProtoDataMessageClosedGroupControlMessage?) { @@ -3041,6 +3145,7 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr self.group = group self.quote = quote self.preview = preview + self.groupCallUpdate = groupCallUpdate self.profile = profile self.openGroupInvitation = openGroupInvitation self.closedGroupControlMessage = closedGroupControlMessage @@ -3073,6 +3178,11 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr var preview: [SNProtoDataMessagePreview] = [] preview = try proto.preview.map { try SNProtoDataMessagePreview.parseProto($0) } + var groupCallUpdate: SNProtoDataMessageGroupCallUpdate? = nil + if proto.hasGroupCallUpdate { + groupCallUpdate = try SNProtoDataMessageGroupCallUpdate.parseProto(proto.groupCallUpdate) + } + var profile: SNProtoDataMessageLokiProfile? = nil if proto.hasProfile { profile = try SNProtoDataMessageLokiProfile.parseProto(proto.profile) @@ -3097,6 +3207,7 @@ extension SNProtoDataMessageClosedGroupControlMessage.SNProtoDataMessageClosedGr group: group, quote: quote, preview: preview, + groupCallUpdate: groupCallUpdate, profile: profile, openGroupInvitation: openGroupInvitation, closedGroupControlMessage: closedGroupControlMessage) diff --git a/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift b/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift index ec5dd7649..37df25bc6 100644 --- a/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift +++ b/SessionMessagingKit/Protos/Generated/SessionProtos.pb.swift @@ -857,6 +857,15 @@ struct SessionProtos_DataMessage { set {_uniqueStorage()._preview = newValue} } + var groupCallUpdate: SessionProtos_DataMessage.GroupCallUpdate { + get {return _storage._groupCallUpdate ?? SessionProtos_DataMessage.GroupCallUpdate()} + set {_uniqueStorage()._groupCallUpdate = newValue} + } + /// Returns true if `groupCallUpdate` has been explicitly set. + var hasGroupCallUpdate: Bool {return _storage._groupCallUpdate != nil} + /// Clears the value of `groupCallUpdate`. Subsequent reads from it will return its default value. + mutating func clearGroupCallUpdate() {_uniqueStorage()._groupCallUpdate = nil} + var profile: SessionProtos_DataMessage.LokiProfile { get {return _storage._profile ?? SessionProtos_DataMessage.LokiProfile()} set {_uniqueStorage()._profile = newValue} @@ -1295,6 +1304,27 @@ struct SessionProtos_DataMessage { fileprivate var _expirationTimer: UInt32? = nil } + struct GroupCallUpdate { + // 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 eraID: String { + get {return _eraID ?? String()} + set {_eraID = newValue} + } + /// Returns true if `eraID` has been explicitly set. + var hasEraID: Bool {return self._eraID != nil} + /// Clears the value of `eraID`. Subsequent reads from it will return its default value. + mutating func clearEraID() {self._eraID = nil} + + var unknownFields = SwiftProtobuf.UnknownStorage() + + init() {} + + fileprivate var _eraID: String? = nil + } + init() {} fileprivate var _storage = _StorageClass.defaultInstance @@ -2507,6 +2537,7 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa 7: .same(proto: "timestamp"), 8: .same(proto: "quote"), 10: .same(proto: "preview"), + 19: .same(proto: "groupCallUpdate"), 101: .same(proto: "profile"), 102: .same(proto: "openGroupInvitation"), 104: .same(proto: "closedGroupControlMessage"), @@ -2523,6 +2554,7 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa var _timestamp: UInt64? = nil var _quote: SessionProtos_DataMessage.Quote? = nil var _preview: [SessionProtos_DataMessage.Preview] = [] + var _groupCallUpdate: SessionProtos_DataMessage.GroupCallUpdate? = nil var _profile: SessionProtos_DataMessage.LokiProfile? = nil var _openGroupInvitation: SessionProtos_DataMessage.OpenGroupInvitation? = nil var _closedGroupControlMessage: SessionProtos_DataMessage.ClosedGroupControlMessage? = nil @@ -2542,6 +2574,7 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa _timestamp = source._timestamp _quote = source._quote _preview = source._preview + _groupCallUpdate = source._groupCallUpdate _profile = source._profile _openGroupInvitation = source._openGroupInvitation _closedGroupControlMessage = source._closedGroupControlMessage @@ -2585,6 +2618,7 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa case 7: try { try decoder.decodeSingularUInt64Field(value: &_storage._timestamp) }() case 8: try { try decoder.decodeSingularMessageField(value: &_storage._quote) }() case 10: try { try decoder.decodeRepeatedMessageField(value: &_storage._preview) }() + case 19: try { try decoder.decodeSingularMessageField(value: &_storage._groupCallUpdate) }() case 101: try { try decoder.decodeSingularMessageField(value: &_storage._profile) }() case 102: try { try decoder.decodeSingularMessageField(value: &_storage._openGroupInvitation) }() case 104: try { try decoder.decodeSingularMessageField(value: &_storage._closedGroupControlMessage) }() @@ -2624,6 +2658,9 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa if !_storage._preview.isEmpty { try visitor.visitRepeatedMessageField(value: _storage._preview, fieldNumber: 10) } + if let v = _storage._groupCallUpdate { + try visitor.visitSingularMessageField(value: v, fieldNumber: 19) + } if let v = _storage._profile { try visitor.visitSingularMessageField(value: v, fieldNumber: 101) } @@ -2654,6 +2691,7 @@ extension SessionProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf._Messa if _storage._timestamp != rhs_storage._timestamp {return false} if _storage._quote != rhs_storage._quote {return false} if _storage._preview != rhs_storage._preview {return false} + if _storage._groupCallUpdate != rhs_storage._groupCallUpdate {return false} if _storage._profile != rhs_storage._profile {return false} if _storage._openGroupInvitation != rhs_storage._openGroupInvitation {return false} if _storage._closedGroupControlMessage != rhs_storage._closedGroupControlMessage {return false} @@ -3060,6 +3098,38 @@ extension SessionProtos_DataMessage.ClosedGroupControlMessage.KeyPairWrapper: Sw } } +extension SessionProtos_DataMessage.GroupCallUpdate: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { + static let protoMessageName: String = SessionProtos_DataMessage.protoMessageName + ".GroupCallUpdate" + static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ + 1: .same(proto: "eraId"), + ] + + mutating func decodeMessage(decoder: inout D) throws { + while let fieldNumber = try decoder.nextFieldNumber() { + // The use of inline closures is to circumvent an issue where the compiler + // allocates stack space for every case branch when no optimizations are + // enabled. https://github.com/apple/swift-protobuf/issues/1034 + switch fieldNumber { + case 1: try { try decoder.decodeSingularStringField(value: &self._eraID) }() + default: break + } + } + } + + func traverse(visitor: inout V) throws { + if let v = self._eraID { + try visitor.visitSingularStringField(value: v, fieldNumber: 1) + } + try unknownFields.traverse(visitor: &visitor) + } + + static func ==(lhs: SessionProtos_DataMessage.GroupCallUpdate, rhs: SessionProtos_DataMessage.GroupCallUpdate) -> Bool { + if lhs._eraID != rhs._eraID {return false} + if lhs.unknownFields != rhs.unknownFields {return false} + return true + } +} + extension SessionProtos_ConfigurationMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ConfigurationMessage" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ diff --git a/SessionMessagingKit/Protos/SessionProtos.proto b/SessionMessagingKit/Protos/SessionProtos.proto index 0b947c959..2c6a2de49 100644 --- a/SessionMessagingKit/Protos/SessionProtos.proto +++ b/SessionMessagingKit/Protos/SessionProtos.proto @@ -86,7 +86,7 @@ message CallMessage { } message Hangup { - + enum Type { HANGUP_NORMAL = 0; HANGUP_ACCEPTED = 1; @@ -215,6 +215,10 @@ message DataMessage { optional uint32 expirationTimer = 8; } + message GroupCallUpdate { + optional string eraId = 1; + } + optional string body = 1; repeated AttachmentPointer attachments = 2; optional GroupContext group = 3; @@ -224,6 +228,7 @@ message DataMessage { optional uint64 timestamp = 7; optional Quote quote = 8; repeated Preview preview = 10; + optional GroupCallUpdate groupCallUpdate = 19; optional LokiProfile profile = 101; optional OpenGroupInvitation openGroupInvitation = 102; optional ClosedGroupControlMessage closedGroupControlMessage = 104;