From 21523ac5229415a93d747594d388525f732d92e6 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 7 Aug 2018 15:29:21 -0400 Subject: [PATCH] Respond to CR. --- Scripts/ProtoWrappers.py | 39 +- .../Jobs/MultiDeviceProfileKeyUpdateJob.swift | 2 +- .../src/Devices/OWSChunkedOutputStream.h | 2 +- .../src/Devices/OWSChunkedOutputStream.m | 24 +- .../src/Devices/OWSContactsOutputStream.m | 2 +- .../src/Devices/OWSGroupsOutputStream.m | 2 +- .../Protos/Generated/FingerprintProto.swift | 28 - .../Protos/Generated/ProvisioningProto.swift | 38 -- .../src/Protos/Generated/SSKProto.swift | 612 ------------------ .../src/Protos/Generated/SignalIOSProto.swift | 26 - .../src/Protos/Generated/WebSocketProto.swift | 56 -- 11 files changed, 43 insertions(+), 788 deletions(-) diff --git a/Scripts/ProtoWrappers.py b/Scripts/ProtoWrappers.py index 3fab30fc7..1eac49ad1 100755 --- a/Scripts/ProtoWrappers.py +++ b/Scripts/ProtoWrappers.py @@ -613,15 +613,16 @@ public func serializedData() throws -> Data { writer.newline() # description - writer.add('@objc public override var description: String {') - writer.push_indent() - writer.add('var fields = [String]()') - for field in self.fields(): - writer.add('fields.append("%s: \(proto.%s)")' % ( field.name_swift, field.name_swift, ) ) - writer.add('return "[" + fields.joined(separator: ", ") + "]"') - writer.pop_indent() - writer.add('}') - writer.newline() + if self.args.add_description: + writer.add('@objc public override var description: String {') + writer.push_indent() + writer.add('var fields = [String]()') + for field in self.fields(): + writer.add('fields.append("%s: \(proto.%s)")' % ( field.name_swift, field.name_swift, ) ) + writer.add('return "[" + fields.joined(separator: ", ") + "]"') + writer.pop_indent() + writer.add('}') + writer.newline() writer.pop_context() @@ -735,15 +736,16 @@ public func serializedData() throws -> Data { writer.newline() # description - writer.add('@objc public override var description: String {') - writer.push_indent() - writer.add('var fields = [String]()') - for field in self.fields(): - writer.add('fields.append("%s: \(proto.%s)")' % ( field.name_swift, field.name_swift, ) ) - writer.add('return "[" + fields.joined(separator: ", ") + "]"') - writer.pop_indent() - writer.add('}') - writer.newline() + if self.args.add_description: + writer.add('@objc public override var description: String {') + writer.push_indent() + writer.add('var fields = [String]()') + for field in self.fields(): + writer.add('fields.append("%s: \(proto.%s)")' % ( field.name_swift, field.name_swift, ) ) + writer.add('return "[" + fields.joined(separator: ", ") + "]"') + writer.pop_indent() + writer.add('}') + writer.newline() writer.pop_context() @@ -1124,6 +1126,7 @@ if __name__ == "__main__": parser.add_argument('--proto-prefix', help='name prefix for proto bufs.') parser.add_argument('--dst-dir', help='path to the destination directory.') parser.add_argument('--add-log-tag', action='store_true', help='add log tag properties.') + parser.add_argument('--add-description', action='store_true', help='add log tag properties.') parser.add_argument('--verbose', action='store_true', help='enables verbose logging') args = parser.parse_args() diff --git a/Signal/src/Jobs/MultiDeviceProfileKeyUpdateJob.swift b/Signal/src/Jobs/MultiDeviceProfileKeyUpdateJob.swift index 7f6b1a4a9..49aecfd17 100644 --- a/Signal/src/Jobs/MultiDeviceProfileKeyUpdateJob.swift +++ b/Signal/src/Jobs/MultiDeviceProfileKeyUpdateJob.swift @@ -54,7 +54,7 @@ import SignalMessaging owsFail("\(self.logTag) could not serialize sync contacts data") return } - dataSource = DataSourceValue.dataSource(withSyncMessageData: messageData) + dataSource = DataSourceValue.dataSource(withSyncMessageData: messageData) } guard let attachmentDataSource = dataSource else { diff --git a/SignalServiceKit/src/Devices/OWSChunkedOutputStream.h b/SignalServiceKit/src/Devices/OWSChunkedOutputStream.h index 617fa793b..537a40f15 100644 --- a/SignalServiceKit/src/Devices/OWSChunkedOutputStream.h +++ b/SignalServiceKit/src/Devices/OWSChunkedOutputStream.h @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN // Returns NO on error. - (BOOL)writeData:(NSData *)data; -- (BOOL)writeUInt32:(UInt32)value; +- (BOOL)writeVariableLengthUInt32:(UInt32)value; @end diff --git a/SignalServiceKit/src/Devices/OWSChunkedOutputStream.m b/SignalServiceKit/src/Devices/OWSChunkedOutputStream.m index 96f39696d..eb37d45f2 100644 --- a/SignalServiceKit/src/Devices/OWSChunkedOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSChunkedOutputStream.m @@ -42,16 +42,28 @@ NS_ASSUME_NONNULL_BEGIN - (BOOL)writeData:(NSData *)data { OWSAssert(data); - NSInteger written = [self.outputStream write:data.bytes maxLength:data.length]; - if (written != data.length) { - OWSFail(@"%@ could not write to output stream.", self.logTag); - self.hasError = YES; - return NO; + + if (data.length < 1) { + return YES; + } + + while (YES) { + NSInteger written = [self.outputStream write:data.bytes maxLength:data.length]; + if (written < 1) { + OWSFail(@"%@ could not write to output stream.", self.logTag); + self.hasError = YES; + return NO; + } + if (written < data.length) { + data = [data subdataWithRange:NSMakeRange(written, data.length - written)]; + } else { + return YES; + } } return YES; } -- (BOOL)writeUInt32:(UInt32)value +- (BOOL)writeVariableLengthUInt32:(UInt32)value { while (YES) { if (value <= 0x7F) { diff --git a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m index be5b836aa..ff46a944d 100644 --- a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m @@ -96,7 +96,7 @@ disappearingMessagesConfiguration:(nullable OWSDisappearingMessagesConfiguration } uint32_t contactDataLength = (uint32_t)contactData.length; - [self writeUInt32:contactDataLength]; + [self writeVariableLengthUInt32:contactDataLength]; [self writeData:contactData]; if (avatarPng) { diff --git a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m index 4651d4e0a..9066c6cca 100644 --- a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m +++ b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m @@ -68,7 +68,7 @@ NS_ASSUME_NONNULL_BEGIN uint32_t groupDataLength = (uint32_t)groupData.length; - [self writeUInt32:groupDataLength]; + [self writeVariableLengthUInt32:groupDataLength]; [self writeData:groupData]; if (avatarPng) { diff --git a/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift b/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift index d7d8f38f0..a77eaf179 100644 --- a/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift +++ b/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift @@ -43,12 +43,6 @@ public enum FingerprintProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try FingerprintProtoLogicalFingerprint.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("identityData: \(proto.identityData)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: FingerprintProtos_LogicalFingerprint @@ -94,12 +88,6 @@ public enum FingerprintProtoError: Error { identityData: identityData) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("identityData: \(proto.identityData)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - FingerprintProtoLogicalFingerprints @@ -142,14 +130,6 @@ public enum FingerprintProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try FingerprintProtoLogicalFingerprints.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("version: \(proto.version)") - fields.append("localFingerprint: \(proto.localFingerprint)") - fields.append("remoteFingerprint: \(proto.remoteFingerprint)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: FingerprintProtos_LogicalFingerprints @@ -215,12 +195,4 @@ public enum FingerprintProtoError: Error { remoteFingerprint: remoteFingerprint) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("version: \(proto.version)") - fields.append("localFingerprint: \(proto.localFingerprint)") - fields.append("remoteFingerprint: \(proto.remoteFingerprint)") - return "[" + fields.joined(separator: ", ") + "]" - } } diff --git a/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift b/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift index edef7ee1c..ecee3b145 100644 --- a/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift +++ b/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift @@ -47,13 +47,6 @@ public enum ProvisioningProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try ProvisioningProtoProvisionEnvelope.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("publicKey: \(proto.publicKey)") - fields.append("body: \(proto.body)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: ProvisioningProtos_ProvisionEnvelope @@ -109,13 +102,6 @@ public enum ProvisioningProtoError: Error { body: body) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("publicKey: \(proto.publicKey)") - fields.append("body: \(proto.body)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - ProvisioningProtoProvisionMessage @@ -174,18 +160,6 @@ public enum ProvisioningProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try ProvisioningProtoProvisionMessage.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("identityKeyPublic: \(proto.identityKeyPublic)") - fields.append("identityKeyPrivate: \(proto.identityKeyPrivate)") - fields.append("number: \(proto.number)") - fields.append("provisioningCode: \(proto.provisioningCode)") - fields.append("userAgent: \(proto.userAgent)") - fields.append("profileKey: \(proto.profileKey)") - fields.append("readReceipts: \(proto.readReceipts)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: ProvisioningProtos_ProvisionMessage @@ -291,16 +265,4 @@ public enum ProvisioningProtoError: Error { readReceipts: readReceipts) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("identityKeyPublic: \(proto.identityKeyPublic)") - fields.append("identityKeyPrivate: \(proto.identityKeyPrivate)") - fields.append("number: \(proto.number)") - fields.append("provisioningCode: \(proto.provisioningCode)") - fields.append("userAgent: \(proto.userAgent)") - fields.append("profileKey: \(proto.profileKey)") - fields.append("readReceipts: \(proto.readReceipts)") - return "[" + fields.joined(separator: ", ") + "]" - } } diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index e112b4002..86b57c84e 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -97,18 +97,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoEnvelope.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - fields.append("source: \(proto.source)") - fields.append("sourceDevice: \(proto.sourceDevice)") - fields.append("relay: \(proto.relay)") - fields.append("timestamp: \(proto.timestamp)") - fields.append("legacyMessage: \(proto.legacyMessage)") - fields.append("content: \(proto.content)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_Envelope @@ -214,18 +202,6 @@ public enum SSKProtoError: Error { timestamp: timestamp) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - fields.append("source: \(proto.source)") - fields.append("sourceDevice: \(proto.sourceDevice)") - fields.append("relay: \(proto.relay)") - fields.append("timestamp: \(proto.timestamp)") - fields.append("legacyMessage: \(proto.legacyMessage)") - fields.append("content: \(proto.content)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoContent @@ -276,16 +252,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoContent.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("dataMessage: \(proto.dataMessage)") - fields.append("syncMessage: \(proto.syncMessage)") - fields.append("callMessage: \(proto.callMessage)") - fields.append("nullMessage: \(proto.nullMessage)") - fields.append("receiptMessage: \(proto.receiptMessage)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_Content @@ -386,16 +352,6 @@ public enum SSKProtoError: Error { receiptMessage: receiptMessage) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("dataMessage: \(proto.dataMessage)") - fields.append("syncMessage: \(proto.syncMessage)") - fields.append("callMessage: \(proto.callMessage)") - fields.append("nullMessage: \(proto.nullMessage)") - fields.append("receiptMessage: \(proto.receiptMessage)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoCallMessageOffer @@ -434,13 +390,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoCallMessageOffer.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("sessionDescription: \(proto.sessionDescription)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_CallMessage.Offer @@ -496,13 +445,6 @@ public enum SSKProtoError: Error { sessionDescription: sessionDescription) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("sessionDescription: \(proto.sessionDescription)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoCallMessageAnswer @@ -541,13 +483,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoCallMessageAnswer.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("sessionDescription: \(proto.sessionDescription)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_CallMessage.Answer @@ -603,13 +538,6 @@ public enum SSKProtoError: Error { sessionDescription: sessionDescription) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("sessionDescription: \(proto.sessionDescription)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoCallMessageIceUpdate @@ -656,15 +584,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoCallMessageIceUpdate.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("sdpMid: \(proto.sdpMid)") - fields.append("sdpMlineIndex: \(proto.sdpMlineIndex)") - fields.append("sdp: \(proto.sdp)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_CallMessage.IceUpdate @@ -740,15 +659,6 @@ public enum SSKProtoError: Error { sdp: sdp) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("sdpMid: \(proto.sdpMid)") - fields.append("sdpMlineIndex: \(proto.sdpMlineIndex)") - fields.append("sdp: \(proto.sdp)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoCallMessageBusy @@ -783,12 +693,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoCallMessageBusy.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_CallMessage.Busy @@ -834,12 +738,6 @@ public enum SSKProtoError: Error { id: id) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoCallMessageHangup @@ -874,12 +772,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoCallMessageHangup.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_CallMessage.Hangup @@ -925,12 +817,6 @@ public enum SSKProtoError: Error { id: id) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoCallMessage @@ -991,17 +877,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoCallMessage.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("offer: \(proto.offer)") - fields.append("answer: \(proto.answer)") - fields.append("iceUpdate: \(proto.iceUpdate)") - fields.append("hangup: \(proto.hangup)") - fields.append("busy: \(proto.busy)") - fields.append("profileKey: \(proto.profileKey)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_CallMessage @@ -1107,17 +982,6 @@ public enum SSKProtoError: Error { busy: busy) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("offer: \(proto.offer)") - fields.append("answer: \(proto.answer)") - fields.append("iceUpdate: \(proto.iceUpdate)") - fields.append("hangup: \(proto.hangup)") - fields.append("busy: \(proto.busy)") - fields.append("profileKey: \(proto.profileKey)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoDataMessageQuoteQuotedAttachment @@ -1182,15 +1046,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoDataMessageQuoteQuotedAttachment.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("contentType: \(proto.contentType)") - fields.append("fileName: \(proto.fileName)") - fields.append("thumbnail: \(proto.thumbnail)") - fields.append("flags: \(proto.flags)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_DataMessage.Quote.QuotedAttachment @@ -1266,15 +1121,6 @@ public enum SSKProtoError: Error { thumbnail: thumbnail) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("contentType: \(proto.contentType)") - fields.append("fileName: \(proto.fileName)") - fields.append("thumbnail: \(proto.thumbnail)") - fields.append("flags: \(proto.flags)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoDataMessageQuote @@ -1327,15 +1173,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoDataMessageQuote.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("author: \(proto.author)") - fields.append("text: \(proto.text)") - fields.append("attachments: \(proto.attachments)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_DataMessage.Quote @@ -1409,15 +1246,6 @@ public enum SSKProtoError: Error { attachments: attachments) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("author: \(proto.author)") - fields.append("text: \(proto.text)") - fields.append("attachments: \(proto.attachments)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoDataMessageContactName @@ -1472,17 +1300,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoDataMessageContactName.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("givenName: \(proto.givenName)") - fields.append("familyName: \(proto.familyName)") - fields.append("prefix: \(proto.prefix)") - fields.append("suffix: \(proto.suffix)") - fields.append("middleName: \(proto.middleName)") - fields.append("displayName: \(proto.displayName)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_DataMessage.Contact.Name @@ -1578,17 +1395,6 @@ public enum SSKProtoError: Error { let result = SSKProtoDataMessageContactName(proto: proto) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("givenName: \(proto.givenName)") - fields.append("familyName: \(proto.familyName)") - fields.append("prefix: \(proto.prefix)") - fields.append("suffix: \(proto.suffix)") - fields.append("middleName: \(proto.middleName)") - fields.append("displayName: \(proto.displayName)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoDataMessageContactPhone @@ -1658,14 +1464,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoDataMessageContactPhone.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("value: \(proto.value)") - fields.append("type: \(proto.type)") - fields.append("label: \(proto.label)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_DataMessage.Contact.Phone @@ -1728,14 +1526,6 @@ public enum SSKProtoError: Error { let result = SSKProtoDataMessageContactPhone(proto: proto) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("value: \(proto.value)") - fields.append("type: \(proto.type)") - fields.append("label: \(proto.label)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoDataMessageContactEmail @@ -1805,14 +1595,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoDataMessageContactEmail.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("value: \(proto.value)") - fields.append("type: \(proto.type)") - fields.append("label: \(proto.label)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_DataMessage.Contact.Email @@ -1875,14 +1657,6 @@ public enum SSKProtoError: Error { let result = SSKProtoDataMessageContactEmail(proto: proto) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("value: \(proto.value)") - fields.append("type: \(proto.type)") - fields.append("label: \(proto.label)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoDataMessageContactPostalAddress @@ -1973,20 +1747,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoDataMessageContactPostalAddress.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - fields.append("label: \(proto.label)") - fields.append("street: \(proto.street)") - fields.append("pobox: \(proto.pobox)") - fields.append("neighborhood: \(proto.neighborhood)") - fields.append("city: \(proto.city)") - fields.append("region: \(proto.region)") - fields.append("postcode: \(proto.postcode)") - fields.append("country: \(proto.country)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_DataMessage.Contact.PostalAddress @@ -2109,20 +1869,6 @@ public enum SSKProtoError: Error { let result = SSKProtoDataMessageContactPostalAddress(proto: proto) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - fields.append("label: \(proto.label)") - fields.append("street: \(proto.street)") - fields.append("pobox: \(proto.pobox)") - fields.append("neighborhood: \(proto.neighborhood)") - fields.append("city: \(proto.city)") - fields.append("region: \(proto.region)") - fields.append("postcode: \(proto.postcode)") - fields.append("country: \(proto.country)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoDataMessageContactAvatar @@ -2161,13 +1907,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoDataMessageContactAvatar.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("avatar: \(proto.avatar)") - fields.append("isProfile: \(proto.isProfile)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_DataMessage.Contact.Avatar @@ -2223,13 +1962,6 @@ public enum SSKProtoError: Error { avatar: avatar) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("avatar: \(proto.avatar)") - fields.append("isProfile: \(proto.isProfile)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoDataMessageContact @@ -2302,17 +2034,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoDataMessageContact.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("name: \(proto.name)") - fields.append("number: \(proto.number)") - fields.append("email: \(proto.email)") - fields.append("address: \(proto.address)") - fields.append("avatar: \(proto.avatar)") - fields.append("organization: \(proto.organization)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_DataMessage.Contact @@ -2408,17 +2129,6 @@ public enum SSKProtoError: Error { avatar: avatar) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("name: \(proto.name)") - fields.append("number: \(proto.number)") - fields.append("email: \(proto.email)") - fields.append("address: \(proto.address)") - fields.append("avatar: \(proto.avatar)") - fields.append("organization: \(proto.organization)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoDataMessage @@ -2521,20 +2231,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoDataMessage.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("body: \(proto.body)") - fields.append("attachments: \(proto.attachments)") - fields.append("group: \(proto.group)") - fields.append("flags: \(proto.flags)") - fields.append("expireTimer: \(proto.expireTimer)") - fields.append("profileKey: \(proto.profileKey)") - fields.append("timestamp: \(proto.timestamp)") - fields.append("quote: \(proto.quote)") - fields.append("contact: \(proto.contact)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_DataMessage @@ -2653,20 +2349,6 @@ public enum SSKProtoError: Error { contact: contact) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("body: \(proto.body)") - fields.append("attachments: \(proto.attachments)") - fields.append("group: \(proto.group)") - fields.append("flags: \(proto.flags)") - fields.append("expireTimer: \(proto.expireTimer)") - fields.append("profileKey: \(proto.profileKey)") - fields.append("timestamp: \(proto.timestamp)") - fields.append("quote: \(proto.quote)") - fields.append("contact: \(proto.contact)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoNullMessage @@ -2701,12 +2383,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoNullMessage.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("padding: \(proto.padding)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_NullMessage @@ -2752,12 +2428,6 @@ public enum SSKProtoError: Error { let result = SSKProtoNullMessage(proto: proto) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("padding: \(proto.padding)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoReceiptMessage @@ -2823,13 +2493,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoReceiptMessage.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - fields.append("timestamp: \(proto.timestamp)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_ReceiptMessage @@ -2879,13 +2542,6 @@ public enum SSKProtoError: Error { type: type) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - fields.append("timestamp: \(proto.timestamp)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoVerified @@ -2956,15 +2612,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoVerified.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("destination: \(proto.destination)") - fields.append("identityKey: \(proto.identityKey)") - fields.append("state: \(proto.state)") - fields.append("nullMessage: \(proto.nullMessage)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_Verified @@ -3037,15 +2684,6 @@ public enum SSKProtoError: Error { destination: destination) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("destination: \(proto.destination)") - fields.append("identityKey: \(proto.identityKey)") - fields.append("state: \(proto.state)") - fields.append("nullMessage: \(proto.nullMessage)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoSyncMessageSent @@ -3092,15 +2730,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoSyncMessageSent.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("destination: \(proto.destination)") - fields.append("timestamp: \(proto.timestamp)") - fields.append("message: \(proto.message)") - fields.append("expirationStartTimestamp: \(proto.expirationStartTimestamp)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_SyncMessage.Sent @@ -3173,15 +2802,6 @@ public enum SSKProtoError: Error { message: message) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("destination: \(proto.destination)") - fields.append("timestamp: \(proto.timestamp)") - fields.append("message: \(proto.message)") - fields.append("expirationStartTimestamp: \(proto.expirationStartTimestamp)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoSyncMessageContacts @@ -3220,13 +2840,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoSyncMessageContacts.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("blob: \(proto.blob)") - fields.append("isComplete: \(proto.isComplete)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_SyncMessage.Contacts @@ -3279,13 +2892,6 @@ public enum SSKProtoError: Error { blob: blob) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("blob: \(proto.blob)") - fields.append("isComplete: \(proto.isComplete)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoSyncMessageGroups @@ -3320,12 +2926,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoSyncMessageGroups.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("blob: \(proto.blob)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_SyncMessage.Groups @@ -3374,12 +2974,6 @@ public enum SSKProtoError: Error { blob: blob) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("blob: \(proto.blob)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoSyncMessageBlocked @@ -3420,12 +3014,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoSyncMessageBlocked.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("numbers: \(proto.numbers)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_SyncMessage.Blocked @@ -3465,12 +3053,6 @@ public enum SSKProtoError: Error { let result = SSKProtoSyncMessageBlocked(proto: proto) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("numbers: \(proto.numbers)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoSyncMessageRequest @@ -3535,12 +3117,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoSyncMessageRequest.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_SyncMessage.Request @@ -3586,12 +3162,6 @@ public enum SSKProtoError: Error { type: type) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoSyncMessageRead @@ -3630,13 +3200,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoSyncMessageRead.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("sender: \(proto.sender)") - fields.append("timestamp: \(proto.timestamp)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_SyncMessage.Read @@ -3692,13 +3255,6 @@ public enum SSKProtoError: Error { timestamp: timestamp) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("sender: \(proto.sender)") - fields.append("timestamp: \(proto.timestamp)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoSyncMessageConfiguration @@ -3733,12 +3289,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoSyncMessageConfiguration.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("readReceipts: \(proto.readReceipts)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_SyncMessage.Configuration @@ -3781,12 +3331,6 @@ public enum SSKProtoError: Error { let result = SSKProtoSyncMessageConfiguration(proto: proto) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("readReceipts: \(proto.readReceipts)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoSyncMessage @@ -3859,20 +3403,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoSyncMessage.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("sent: \(proto.sent)") - fields.append("contacts: \(proto.contacts)") - fields.append("groups: \(proto.groups)") - fields.append("request: \(proto.request)") - fields.append("read: \(proto.read)") - fields.append("blocked: \(proto.blocked)") - fields.append("verified: \(proto.verified)") - fields.append("configuration: \(proto.configuration)") - fields.append("padding: \(proto.padding)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_SyncMessage @@ -4017,20 +3547,6 @@ public enum SSKProtoError: Error { configuration: configuration) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("sent: \(proto.sent)") - fields.append("contacts: \(proto.contacts)") - fields.append("groups: \(proto.groups)") - fields.append("request: \(proto.request)") - fields.append("read: \(proto.read)") - fields.append("blocked: \(proto.blocked)") - fields.append("verified: \(proto.verified)") - fields.append("configuration: \(proto.configuration)") - fields.append("padding: \(proto.padding)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoAttachmentPointer @@ -4119,21 +3635,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoAttachmentPointer.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("contentType: \(proto.contentType)") - fields.append("key: \(proto.key)") - fields.append("size: \(proto.size)") - fields.append("thumbnail: \(proto.thumbnail)") - fields.append("digest: \(proto.digest)") - fields.append("fileName: \(proto.fileName)") - fields.append("flags: \(proto.flags)") - fields.append("width: \(proto.width)") - fields.append("height: \(proto.height)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_AttachmentPointer @@ -4257,21 +3758,6 @@ public enum SSKProtoError: Error { id: id) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("contentType: \(proto.contentType)") - fields.append("key: \(proto.key)") - fields.append("size: \(proto.size)") - fields.append("thumbnail: \(proto.thumbnail)") - fields.append("digest: \(proto.digest)") - fields.append("fileName: \(proto.fileName)") - fields.append("flags: \(proto.flags)") - fields.append("width: \(proto.width)") - fields.append("height: \(proto.height)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoGroupContext @@ -4358,16 +3844,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoGroupContext.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("type: \(proto.type)") - fields.append("name: \(proto.name)") - fields.append("members: \(proto.members)") - fields.append("avatar: \(proto.avatar)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_GroupContext @@ -4450,16 +3926,6 @@ public enum SSKProtoError: Error { avatar: avatar) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("type: \(proto.type)") - fields.append("name: \(proto.name)") - fields.append("members: \(proto.members)") - fields.append("avatar: \(proto.avatar)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoContactDetailsAvatar @@ -4498,13 +3964,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoContactDetailsAvatar.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("contentType: \(proto.contentType)") - fields.append("length: \(proto.length)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_ContactDetails.Avatar @@ -4557,13 +4016,6 @@ public enum SSKProtoError: Error { let result = SSKProtoContactDetailsAvatar(proto: proto) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("contentType: \(proto.contentType)") - fields.append("length: \(proto.length)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoContactDetails @@ -4626,19 +4078,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoContactDetails.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("number: \(proto.number)") - fields.append("name: \(proto.name)") - fields.append("avatar: \(proto.avatar)") - fields.append("color: \(proto.color)") - fields.append("verified: \(proto.verified)") - fields.append("profileKey: \(proto.profileKey)") - fields.append("blocked: \(proto.blocked)") - fields.append("expireTimer: \(proto.expireTimer)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_ContactDetails @@ -4754,19 +4193,6 @@ public enum SSKProtoError: Error { verified: verified) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("number: \(proto.number)") - fields.append("name: \(proto.name)") - fields.append("avatar: \(proto.avatar)") - fields.append("color: \(proto.color)") - fields.append("verified: \(proto.verified)") - fields.append("profileKey: \(proto.profileKey)") - fields.append("blocked: \(proto.blocked)") - fields.append("expireTimer: \(proto.expireTimer)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoGroupDetailsAvatar @@ -4805,13 +4231,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoGroupDetailsAvatar.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("contentType: \(proto.contentType)") - fields.append("length: \(proto.length)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_GroupDetails.Avatar @@ -4864,13 +4283,6 @@ public enum SSKProtoError: Error { let result = SSKProtoGroupDetailsAvatar(proto: proto) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("contentType: \(proto.contentType)") - fields.append("length: \(proto.length)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SSKProtoGroupDetails @@ -4935,18 +4347,6 @@ public enum SSKProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SSKProtoGroupDetails.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("name: \(proto.name)") - fields.append("members: \(proto.members)") - fields.append("avatar: \(proto.avatar)") - fields.append("active: \(proto.active)") - fields.append("expireTimer: \(proto.expireTimer)") - fields.append("color: \(proto.color)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: SignalServiceProtos_GroupDetails @@ -5043,16 +4443,4 @@ public enum SSKProtoError: Error { avatar: avatar) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("id: \(proto.id)") - fields.append("name: \(proto.name)") - fields.append("members: \(proto.members)") - fields.append("avatar: \(proto.avatar)") - fields.append("active: \(proto.active)") - fields.append("expireTimer: \(proto.expireTimer)") - fields.append("color: \(proto.color)") - return "[" + fields.joined(separator: ", ") + "]" - } } diff --git a/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift b/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift index e063f4376..cbc0432f9 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift @@ -77,13 +77,6 @@ public enum SignalIOSProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SignalIOSProtoBackupSnapshotBackupEntity.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - fields.append("entityData: \(proto.entityData)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: IOSProtos_BackupSnapshot.BackupEntity @@ -139,13 +132,6 @@ public enum SignalIOSProtoError: Error { entityData: entityData) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - fields.append("entityData: \(proto.entityData)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - SignalIOSProtoBackupSnapshot @@ -186,12 +172,6 @@ public enum SignalIOSProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try SignalIOSProtoBackupSnapshot.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("entity: \(proto.entity)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: IOSProtos_BackupSnapshot @@ -235,10 +215,4 @@ public enum SignalIOSProtoError: Error { entity: entity) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("entity: \(proto.entity)") - return "[" + fields.joined(separator: ", ") + "]" - } } diff --git a/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift b/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift index 7fb3aaa59..8b26aeae9 100644 --- a/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift +++ b/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift @@ -65,16 +65,6 @@ public enum WebSocketProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try WebSocketProtoWebSocketRequestMessage.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("verb: \(proto.verb)") - fields.append("path: \(proto.path)") - fields.append("body: \(proto.body)") - fields.append("headers: \(proto.headers)") - fields.append("requestID: \(proto.requestID)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: WebSocketProtos_WebSocketRequestMessage @@ -154,16 +144,6 @@ public enum WebSocketProtoError: Error { requestID: requestID) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("verb: \(proto.verb)") - fields.append("path: \(proto.path)") - fields.append("body: \(proto.body)") - fields.append("headers: \(proto.headers)") - fields.append("requestID: \(proto.requestID)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - WebSocketProtoWebSocketResponseMessage @@ -220,16 +200,6 @@ public enum WebSocketProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try WebSocketProtoWebSocketResponseMessage.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("requestID: \(proto.requestID)") - fields.append("status: \(proto.status)") - fields.append("message: \(proto.message)") - fields.append("headers: \(proto.headers)") - fields.append("body: \(proto.body)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: WebSocketProtos_WebSocketResponseMessage @@ -309,16 +279,6 @@ public enum WebSocketProtoError: Error { status: status) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("requestID: \(proto.requestID)") - fields.append("status: \(proto.status)") - fields.append("message: \(proto.message)") - fields.append("headers: \(proto.headers)") - fields.append("body: \(proto.body)") - return "[" + fields.joined(separator: ", ") + "]" - } } // MARK: - WebSocketProtoWebSocketMessage @@ -385,14 +345,6 @@ public enum WebSocketProtoError: Error { @objc public func buildSerializedData() throws -> Data { return try WebSocketProtoWebSocketMessage.parseProto(proto).serializedData() } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - fields.append("request: \(proto.request)") - fields.append("response: \(proto.response)") - return "[" + fields.joined(separator: ", ") + "]" - } } fileprivate let proto: WebSocketProtos_WebSocketMessage @@ -464,12 +416,4 @@ public enum WebSocketProtoError: Error { response: response) return result } - - @objc public override var description: String { - var fields = [String]() - fields.append("type: \(proto.type)") - fields.append("request: \(proto.request)") - fields.append("response: \(proto.response)") - return "[" + fields.joined(separator: ", ") + "]" - } }