From 2fc3a211f1e42e1dbcc754a8af7589ab6146d2a5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 21 Aug 2018 18:40:55 -0600 Subject: [PATCH] restrict debug methods --- Scripts/ProtoWrappers.py | 91 +- Signal/src/Generated/WebRTCProto.swift | 142 +- .../Protos/Generated/FingerprintProto.swift | 68 +- .../Protos/Generated/ProvisioningProto.swift | 68 +- .../src/Protos/Generated/SSKProto.swift | 1212 ++++++++--------- .../src/Protos/Generated/SignalIOSProto.swift | 68 +- .../Protos/Generated/SignalService.pb.swift | 48 - .../src/Protos/Generated/WebSocketProto.swift | 106 +- .../Generated/WebSocketResources.pb.swift | 8 - 9 files changed, 840 insertions(+), 971 deletions(-) diff --git a/Scripts/ProtoWrappers.py b/Scripts/ProtoWrappers.py index bb2cb66ed..1e3655f1b 100755 --- a/Scripts/ProtoWrappers.py +++ b/Scripts/ProtoWrappers.py @@ -35,6 +35,34 @@ def lowerCamlCaseForUnderscoredText_wrapped(name): result = result[:-2] + 'ID' return result +# Provides conext for writing an indented block surrounded by braces. +# +# e.g. +# +# with BracedContext('class Foo', writer) as writer: +# with BracedContext('func bar() -> Bool', writer) as writer: +# return true +# +# Produces: +# +# class Foo { +# func bar() -> Bool { +# return true +# } +# } +# +class BracedContext: + def __init__(self, line, writer): + self.writer = writer + writer.add('%s {' % line) + + def __enter__(self): + self.writer.push_indent() + return self.writer + + def __exit__(self, *args): + self.writer.pop_indent() + self.writer.add('}') class WriterContext: def __init__(self, proto_name, swift_name, parent=None): @@ -43,7 +71,6 @@ class WriterContext: self.parent = parent self.name_map = {} - class LineWriter: def __init__(self, args): self.contexts = [] @@ -51,6 +78,9 @@ class LineWriter: self.lines = [] self.args = args self.current_indent = 0 + + def braced(self, line): + return BracedContext(line, self) def push_indent(self): self.current_indent = self.current_indent + 1 @@ -358,6 +388,7 @@ class MessageContext(BaseContext): def prepare(self): self.swift_name = self.derive_swift_name() + self.swift_builder_name = "%sBuilder" % self.swift_name for child in self.children(): child.prepare() @@ -495,22 +526,7 @@ class MessageContext(BaseContext): writer.pop_indent() writer.add('}') writer.newline() - - # serializedDataIgnoringErrors() func - writer.add('// NOTE: This method is intended for debugging purposes only.') - writer.add('@objc public func serializedDataIgnoringErrors() -> Data? {') - writer.push_indent() - writer.add('guard _isDebugAssertConfiguration() else {') - writer.push_indent() - writer.add('return nil') - writer.pop_indent() - writer.add('}') - writer.newline() - writer.add('return try! self.serializedData()') - writer.pop_indent() - writer.add('}') - writer.newline() - + # serializedData() func writer.extend((''' @objc @@ -628,15 +644,33 @@ public func serializedData() throws -> Data { writer.rstrip() writer.add('}') writer.newline() + self.generate_debug_extension(writer) + + def generate_debug_extension(self, writer): + writer.add('#if DEBUG') + writer.newline() + with writer.braced('extension %s' % self.swift_name) as writer: + with writer.braced('@objc public func serializedDataIgnoringErrors() -> Data?') as writer: + writer.add('return try! self.serializedData()') + + writer.newline() + + with writer.braced('extension %s.%s' % ( self.swift_name, self.swift_builder_name )) as writer: + with writer.braced('@objc public func buildIgnoringErrors() -> %s?' % self.swift_name) as writer: + writer.add('return try! self.build()') + + writer.newline() + writer.add('#endif') + writer.newline() def generate_builder(self, writer): wrapped_swift_name = self.derive_wrapped_swift_name() - writer.add('// MARK: - %sBuilder' % self.swift_name) + writer.add('// MARK: - %s' % self.swift_builder_name) writer.newline() - writer.add('@objc public class %sBuilder: NSObject {' % self.swift_name) + writer.add('@objc public class %s: NSObject {' % self.swift_builder_name) writer.newline() writer.push_context(self.proto_name, self.swift_name) @@ -750,22 +784,7 @@ public func serializedData() throws -> Data { writer.pop_indent() writer.add('}') writer.newline() - - # buildIgnoringErrors() func - writer.add('// NOTE: This method is intended for debugging purposes only.') - writer.add('@objc public func buildIgnoringErrors() -> %s? {' % self.swift_name) - writer.push_indent() - writer.add('guard _isDebugAssertConfiguration() else {') - writer.push_indent() - writer.add('return nil') - writer.pop_indent() - writer.add('}') - writer.newline() - writer.add('return try! self.build()') - writer.pop_indent() - writer.add('}') - writer.newline() - + # build() func writer.add('@objc public func build() throws -> %s {' % self.swift_name) writer.push_indent() @@ -1197,4 +1216,4 @@ if __name__ == "__main__": process_proto_file(args, proto_file_path, dst_file_path) # print 'complete.' - \ No newline at end of file + diff --git a/Signal/src/Generated/WebRTCProto.swift b/Signal/src/Generated/WebRTCProto.swift index 735f7df91..a7b0c13b5 100644 --- a/Signal/src/Generated/WebRTCProto.swift +++ b/Signal/src/Generated/WebRTCProto.swift @@ -33,15 +33,6 @@ public enum WebRTCProtoError: Error { proto.id = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> WebRTCProtoConnected? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> WebRTCProtoConnected { return try WebRTCProtoConnected.parseProto(proto) } @@ -61,15 +52,6 @@ public enum WebRTCProtoError: Error { self.id = id } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -96,6 +78,22 @@ public enum WebRTCProtoError: Error { } } +#if DEBUG + +extension WebRTCProtoConnected { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension WebRTCProtoConnected.WebRTCProtoConnectedBuilder { + @objc public func buildIgnoringErrors() -> WebRTCProtoConnected? { + return try! self.build() + } +} + +#endif + // MARK: - WebRTCProtoHangup @objc public class WebRTCProtoHangup: NSObject { @@ -119,15 +117,6 @@ public enum WebRTCProtoError: Error { proto.id = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> WebRTCProtoHangup? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> WebRTCProtoHangup { return try WebRTCProtoHangup.parseProto(proto) } @@ -147,15 +136,6 @@ public enum WebRTCProtoError: Error { self.id = id } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -182,6 +162,22 @@ public enum WebRTCProtoError: Error { } } +#if DEBUG + +extension WebRTCProtoHangup { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension WebRTCProtoHangup.WebRTCProtoHangupBuilder { + @objc public func buildIgnoringErrors() -> WebRTCProtoHangup? { + return try! self.build() + } +} + +#endif + // MARK: - WebRTCProtoVideoStreamingStatus @objc public class WebRTCProtoVideoStreamingStatus: NSObject { @@ -209,15 +205,6 @@ public enum WebRTCProtoError: Error { proto.enabled = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> WebRTCProtoVideoStreamingStatus? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> WebRTCProtoVideoStreamingStatus { return try WebRTCProtoVideoStreamingStatus.parseProto(proto) } @@ -244,15 +231,6 @@ public enum WebRTCProtoError: Error { self.id = id } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -279,6 +257,22 @@ public enum WebRTCProtoError: Error { } } +#if DEBUG + +extension WebRTCProtoVideoStreamingStatus { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension WebRTCProtoVideoStreamingStatus.WebRTCProtoVideoStreamingStatusBuilder { + @objc public func buildIgnoringErrors() -> WebRTCProtoVideoStreamingStatus? { + return try! self.build() + } +} + +#endif + // MARK: - WebRTCProtoData @objc public class WebRTCProtoData: NSObject { @@ -303,15 +297,6 @@ public enum WebRTCProtoError: Error { proto.videoStreamingStatus = valueParam.proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> WebRTCProtoData? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> WebRTCProtoData { return try WebRTCProtoData.parseProto(proto) } @@ -339,15 +324,6 @@ public enum WebRTCProtoError: Error { self.videoStreamingStatus = videoStreamingStatus } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -359,17 +335,17 @@ public enum WebRTCProtoError: Error { } fileprivate class func parseProto(_ proto: WebRTCProtos_Data) throws -> WebRTCProtoData { - var connected: WebRTCProtoConnected? + var connected: WebRTCProtoConnected? = nil if proto.hasConnected { connected = try WebRTCProtoConnected.parseProto(proto.connected) } - var hangup: WebRTCProtoHangup? + var hangup: WebRTCProtoHangup? = nil if proto.hasHangup { hangup = try WebRTCProtoHangup.parseProto(proto.hangup) } - var videoStreamingStatus: WebRTCProtoVideoStreamingStatus? + var videoStreamingStatus: WebRTCProtoVideoStreamingStatus? = nil if proto.hasVideoStreamingStatus { videoStreamingStatus = try WebRTCProtoVideoStreamingStatus.parseProto(proto.videoStreamingStatus) } @@ -385,3 +361,19 @@ public enum WebRTCProtoError: Error { return result } } + +#if DEBUG + +extension WebRTCProtoData { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension WebRTCProtoData.WebRTCProtoDataBuilder { + @objc public func buildIgnoringErrors() -> WebRTCProtoData? { + return try! self.build() + } +} + +#endif diff --git a/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift b/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift index fbdbcbe53..e8e1d3b3c 100644 --- a/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift +++ b/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift @@ -33,15 +33,6 @@ public enum FingerprintProtoError: Error { proto.identityData = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> FingerprintProtoLogicalFingerprint? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> FingerprintProtoLogicalFingerprint { return try FingerprintProtoLogicalFingerprint.parseProto(proto) } @@ -61,15 +52,6 @@ public enum FingerprintProtoError: Error { self.identityData = identityData } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -96,6 +78,22 @@ public enum FingerprintProtoError: Error { } } +#if DEBUG + +extension FingerprintProtoLogicalFingerprint { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension FingerprintProtoLogicalFingerprint.FingerprintProtoLogicalFingerprintBuilder { + @objc public func buildIgnoringErrors() -> FingerprintProtoLogicalFingerprint? { + return try! self.build() + } +} + +#endif + // MARK: - FingerprintProtoLogicalFingerprints @objc public class FingerprintProtoLogicalFingerprints: NSObject { @@ -129,15 +127,6 @@ public enum FingerprintProtoError: Error { proto.remoteFingerprint = valueParam.proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> FingerprintProtoLogicalFingerprints? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> FingerprintProtoLogicalFingerprints { return try FingerprintProtoLogicalFingerprints.parseProto(proto) } @@ -165,15 +154,6 @@ public enum FingerprintProtoError: Error { self.remoteFingerprint = remoteFingerprint } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -211,3 +191,19 @@ public enum FingerprintProtoError: Error { return result } } + +#if DEBUG + +extension FingerprintProtoLogicalFingerprints { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension FingerprintProtoLogicalFingerprints.FingerprintProtoLogicalFingerprintsBuilder { + @objc public func buildIgnoringErrors() -> FingerprintProtoLogicalFingerprints? { + return try! self.build() + } +} + +#endif diff --git a/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift b/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift index f0c28b044..7af5a5176 100644 --- a/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift +++ b/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift @@ -38,15 +38,6 @@ public enum ProvisioningProtoError: Error { proto.body = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> ProvisioningProtoProvisionEnvelope? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> ProvisioningProtoProvisionEnvelope { return try ProvisioningProtoProvisionEnvelope.parseProto(proto) } @@ -70,15 +61,6 @@ public enum ProvisioningProtoError: Error { self.body = body } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -111,6 +93,22 @@ public enum ProvisioningProtoError: Error { } } +#if DEBUG + +extension ProvisioningProtoProvisionEnvelope { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension ProvisioningProtoProvisionEnvelope.ProvisioningProtoProvisionEnvelopeBuilder { + @objc public func buildIgnoringErrors() -> ProvisioningProtoProvisionEnvelope? { + return try! self.build() + } +} + +#endif + // MARK: - ProvisioningProtoProvisionMessage @objc public class ProvisioningProtoProvisionMessage: NSObject { @@ -164,15 +162,6 @@ public enum ProvisioningProtoError: Error { proto.readReceipts = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> ProvisioningProtoProvisionMessage? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> ProvisioningProtoProvisionMessage { return try ProvisioningProtoProvisionMessage.parseProto(proto) } @@ -216,15 +205,6 @@ public enum ProvisioningProtoError: Error { self.readReceipts = readReceipts } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -286,3 +266,19 @@ public enum ProvisioningProtoError: Error { return result } } + +#if DEBUG + +extension ProvisioningProtoProvisionMessage { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension ProvisioningProtoProvisionMessage.ProvisioningProtoProvisionMessageBuilder { + @objc public func buildIgnoringErrors() -> ProvisioningProtoProvisionMessage? { + return try! self.build() + } +} + +#endif diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index 83048460a..6cec80d28 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -90,15 +90,6 @@ public enum SSKProtoError: Error { proto.content = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoEnvelope? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoEnvelope { return try SSKProtoEnvelope.parseProto(proto) } @@ -160,15 +151,6 @@ public enum SSKProtoError: Error { self.timestamp = timestamp } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -213,6 +195,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoEnvelope { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoEnvelope.SSKProtoEnvelopeBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoEnvelope? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoContent @objc public class SSKProtoContent: NSObject { @@ -245,15 +243,6 @@ public enum SSKProtoError: Error { proto.receiptMessage = valueParam.proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoContent? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoContent { return try SSKProtoContent.parseProto(proto) } @@ -289,15 +278,6 @@ public enum SSKProtoError: Error { self.receiptMessage = receiptMessage } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -309,27 +289,27 @@ public enum SSKProtoError: Error { } fileprivate class func parseProto(_ proto: SignalServiceProtos_Content) throws -> SSKProtoContent { - var dataMessage: SSKProtoDataMessage? + var dataMessage: SSKProtoDataMessage? = nil if proto.hasDataMessage { dataMessage = try SSKProtoDataMessage.parseProto(proto.dataMessage) } - var syncMessage: SSKProtoSyncMessage? + var syncMessage: SSKProtoSyncMessage? = nil if proto.hasSyncMessage { syncMessage = try SSKProtoSyncMessage.parseProto(proto.syncMessage) } - var callMessage: SSKProtoCallMessage? + var callMessage: SSKProtoCallMessage? = nil if proto.hasCallMessage { callMessage = try SSKProtoCallMessage.parseProto(proto.callMessage) } - var nullMessage: SSKProtoNullMessage? + var nullMessage: SSKProtoNullMessage? = nil if proto.hasNullMessage { nullMessage = try SSKProtoNullMessage.parseProto(proto.nullMessage) } - var receiptMessage: SSKProtoReceiptMessage? + var receiptMessage: SSKProtoReceiptMessage? = nil if proto.hasReceiptMessage { receiptMessage = try SSKProtoReceiptMessage.parseProto(proto.receiptMessage) } @@ -348,6 +328,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoContent { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoContent.SSKProtoContentBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoContent? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoCallMessageOffer @objc public class SSKProtoCallMessageOffer: NSObject { @@ -376,15 +372,6 @@ public enum SSKProtoError: Error { proto.sessionDescription = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoCallMessageOffer? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoCallMessageOffer { return try SSKProtoCallMessageOffer.parseProto(proto) } @@ -408,15 +395,6 @@ public enum SSKProtoError: Error { self.sessionDescription = sessionDescription } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -449,6 +427,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoCallMessageOffer { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoCallMessageOffer.SSKProtoCallMessageOfferBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoCallMessageOffer? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoCallMessageAnswer @objc public class SSKProtoCallMessageAnswer: NSObject { @@ -477,15 +471,6 @@ public enum SSKProtoError: Error { proto.sessionDescription = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoCallMessageAnswer? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoCallMessageAnswer { return try SSKProtoCallMessageAnswer.parseProto(proto) } @@ -509,15 +494,6 @@ public enum SSKProtoError: Error { self.sessionDescription = sessionDescription } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -550,6 +526,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoCallMessageAnswer { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoCallMessageAnswer.SSKProtoCallMessageAnswerBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoCallMessageAnswer? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoCallMessageIceUpdate @objc public class SSKProtoCallMessageIceUpdate: NSObject { @@ -588,15 +580,6 @@ public enum SSKProtoError: Error { proto.sdp = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoCallMessageIceUpdate? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoCallMessageIceUpdate { return try SSKProtoCallMessageIceUpdate.parseProto(proto) } @@ -628,15 +611,6 @@ public enum SSKProtoError: Error { self.sdp = sdp } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -681,6 +655,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoCallMessageIceUpdate { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoCallMessageIceUpdate.SSKProtoCallMessageIceUpdateBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoCallMessageIceUpdate? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoCallMessageBusy @objc public class SSKProtoCallMessageBusy: NSObject { @@ -704,15 +694,6 @@ public enum SSKProtoError: Error { proto.id = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoCallMessageBusy? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoCallMessageBusy { return try SSKProtoCallMessageBusy.parseProto(proto) } @@ -732,15 +713,6 @@ public enum SSKProtoError: Error { self.id = id } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -767,6 +739,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoCallMessageBusy { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoCallMessageBusy.SSKProtoCallMessageBusyBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoCallMessageBusy? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoCallMessageHangup @objc public class SSKProtoCallMessageHangup: NSObject { @@ -790,15 +778,6 @@ public enum SSKProtoError: Error { proto.id = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoCallMessageHangup? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoCallMessageHangup { return try SSKProtoCallMessageHangup.parseProto(proto) } @@ -818,15 +797,6 @@ public enum SSKProtoError: Error { self.id = id } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -853,6 +823,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoCallMessageHangup { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoCallMessageHangup.SSKProtoCallMessageHangupBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoCallMessageHangup? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoCallMessage @objc public class SSKProtoCallMessage: NSObject { @@ -895,15 +881,6 @@ public enum SSKProtoError: Error { proto.profileKey = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoCallMessage? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoCallMessage { return try SSKProtoCallMessage.parseProto(proto) } @@ -949,15 +926,6 @@ public enum SSKProtoError: Error { self.busy = busy } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -969,12 +937,12 @@ public enum SSKProtoError: Error { } fileprivate class func parseProto(_ proto: SignalServiceProtos_CallMessage) throws -> SSKProtoCallMessage { - var offer: SSKProtoCallMessageOffer? + var offer: SSKProtoCallMessageOffer? = nil if proto.hasOffer { offer = try SSKProtoCallMessageOffer.parseProto(proto.offer) } - var answer: SSKProtoCallMessageAnswer? + var answer: SSKProtoCallMessageAnswer? = nil if proto.hasAnswer { answer = try SSKProtoCallMessageAnswer.parseProto(proto.answer) } @@ -982,12 +950,12 @@ public enum SSKProtoError: Error { var iceUpdate: [SSKProtoCallMessageIceUpdate] = [] iceUpdate = try proto.iceUpdate.map { try SSKProtoCallMessageIceUpdate.parseProto($0) } - var hangup: SSKProtoCallMessageHangup? + var hangup: SSKProtoCallMessageHangup? = nil if proto.hasHangup { hangup = try SSKProtoCallMessageHangup.parseProto(proto.hangup) } - var busy: SSKProtoCallMessageBusy? + var busy: SSKProtoCallMessageBusy? = nil if proto.hasBusy { busy = try SSKProtoCallMessageBusy.parseProto(proto.busy) } @@ -1006,6 +974,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoCallMessage { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoCallMessage.SSKProtoCallMessageBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoCallMessage? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoDataMessageQuoteQuotedAttachment @objc public class SSKProtoDataMessageQuoteQuotedAttachment: NSObject { @@ -1052,15 +1036,6 @@ public enum SSKProtoError: Error { proto.flags = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoDataMessageQuoteQuotedAttachment? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoDataMessageQuoteQuotedAttachment { return try SSKProtoDataMessageQuoteQuotedAttachment.parseProto(proto) } @@ -1107,15 +1082,6 @@ public enum SSKProtoError: Error { self.thumbnail = thumbnail } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -1127,7 +1093,7 @@ public enum SSKProtoError: Error { } fileprivate class func parseProto(_ proto: SignalServiceProtos_DataMessage.Quote.QuotedAttachment) throws -> SSKProtoDataMessageQuoteQuotedAttachment { - var thumbnail: SSKProtoAttachmentPointer? + var thumbnail: SSKProtoAttachmentPointer? = nil if proto.hasThumbnail { thumbnail = try SSKProtoAttachmentPointer.parseProto(proto.thumbnail) } @@ -1142,6 +1108,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoDataMessageQuoteQuotedAttachment { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoDataMessageQuoteQuotedAttachment.SSKProtoDataMessageQuoteQuotedAttachmentBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoDataMessageQuoteQuotedAttachment? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoDataMessageQuote @objc public class SSKProtoDataMessageQuote: NSObject { @@ -1184,15 +1166,6 @@ public enum SSKProtoError: Error { proto.attachments = wrappedItems.map { $0.proto } } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoDataMessageQuote? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoDataMessageQuote { return try SSKProtoDataMessageQuote.parseProto(proto) } @@ -1230,15 +1203,6 @@ public enum SSKProtoError: Error { self.attachments = attachments } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -1275,6 +1239,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoDataMessageQuote { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoDataMessageQuote.SSKProtoDataMessageQuoteBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoDataMessageQuote? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoDataMessageContactName @objc public class SSKProtoDataMessageContactName: NSObject { @@ -1311,15 +1291,6 @@ public enum SSKProtoError: Error { proto.displayName = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContactName? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoDataMessageContactName { return try SSKProtoDataMessageContactName.parseProto(proto) } @@ -1395,15 +1366,6 @@ public enum SSKProtoError: Error { self.proto = proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -1424,6 +1386,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoDataMessageContactName { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoDataMessageContactName.SSKProtoDataMessageContactNameBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContactName? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoDataMessageContactPhone @objc public class SSKProtoDataMessageContactPhone: NSObject { @@ -1475,15 +1453,6 @@ public enum SSKProtoError: Error { proto.label = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContactPhone? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoDataMessageContactPhone { return try SSKProtoDataMessageContactPhone.parseProto(proto) } @@ -1526,15 +1495,6 @@ public enum SSKProtoError: Error { self.proto = proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -1555,6 +1515,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoDataMessageContactPhone { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoDataMessageContactPhone.SSKProtoDataMessageContactPhoneBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContactPhone? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoDataMessageContactEmail @objc public class SSKProtoDataMessageContactEmail: NSObject { @@ -1606,15 +1582,6 @@ public enum SSKProtoError: Error { proto.label = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContactEmail? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoDataMessageContactEmail { return try SSKProtoDataMessageContactEmail.parseProto(proto) } @@ -1657,15 +1624,6 @@ public enum SSKProtoError: Error { self.proto = proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -1686,6 +1644,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoDataMessageContactEmail { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoDataMessageContactEmail.SSKProtoDataMessageContactEmailBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContactEmail? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoDataMessageContactPostalAddress @objc public class SSKProtoDataMessageContactPostalAddress: NSObject { @@ -1758,15 +1732,6 @@ public enum SSKProtoError: Error { proto.country = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContactPostalAddress? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoDataMessageContactPostalAddress { return try SSKProtoDataMessageContactPostalAddress.parseProto(proto) } @@ -1869,15 +1834,6 @@ public enum SSKProtoError: Error { self.proto = proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -1898,6 +1854,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoDataMessageContactPostalAddress { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoDataMessageContactPostalAddress.SSKProtoDataMessageContactPostalAddressBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContactPostalAddress? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoDataMessageContactAvatar @objc public class SSKProtoDataMessageContactAvatar: NSObject { @@ -1918,15 +1890,6 @@ public enum SSKProtoError: Error { proto.isProfile = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContactAvatar? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoDataMessageContactAvatar { return try SSKProtoDataMessageContactAvatar.parseProto(proto) } @@ -1953,15 +1916,6 @@ public enum SSKProtoError: Error { self.avatar = avatar } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -1973,7 +1927,7 @@ public enum SSKProtoError: Error { } fileprivate class func parseProto(_ proto: SignalServiceProtos_DataMessage.Contact.Avatar) throws -> SSKProtoDataMessageContactAvatar { - var avatar: SSKProtoAttachmentPointer? + var avatar: SSKProtoAttachmentPointer? = nil if proto.hasAvatar { avatar = try SSKProtoAttachmentPointer.parseProto(proto.avatar) } @@ -1988,6 +1942,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoDataMessageContactAvatar { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoDataMessageContactAvatar.SSKProtoDataMessageContactAvatarBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContactAvatar? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoDataMessageContact @objc public class SSKProtoDataMessageContact: NSObject { @@ -2042,15 +2012,6 @@ public enum SSKProtoError: Error { proto.organization = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContact? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoDataMessageContact { return try SSKProtoDataMessageContact.parseProto(proto) } @@ -2096,15 +2057,6 @@ public enum SSKProtoError: Error { self.avatar = avatar } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -2116,7 +2068,7 @@ public enum SSKProtoError: Error { } fileprivate class func parseProto(_ proto: SignalServiceProtos_DataMessage.Contact) throws -> SSKProtoDataMessageContact { - var name: SSKProtoDataMessageContactName? + var name: SSKProtoDataMessageContactName? = nil if proto.hasName { name = try SSKProtoDataMessageContactName.parseProto(proto.name) } @@ -2130,7 +2082,7 @@ public enum SSKProtoError: Error { var address: [SSKProtoDataMessageContactPostalAddress] = [] address = try proto.address.map { try SSKProtoDataMessageContactPostalAddress.parseProto($0) } - var avatar: SSKProtoDataMessageContactAvatar? + var avatar: SSKProtoDataMessageContactAvatar? = nil if proto.hasAvatar { avatar = try SSKProtoDataMessageContactAvatar.parseProto(proto.avatar) } @@ -2149,6 +2101,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoDataMessageContact { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoDataMessageContact.SSKProtoDataMessageContactBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoDataMessageContact? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoDataMessage @objc public class SSKProtoDataMessage: NSObject { @@ -2233,15 +2201,6 @@ public enum SSKProtoError: Error { proto.contact = wrappedItems.map { $0.proto } } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoDataMessage? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoDataMessage { return try SSKProtoDataMessage.parseProto(proto) } @@ -2314,15 +2273,6 @@ public enum SSKProtoError: Error { self.contact = contact } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -2337,12 +2287,12 @@ public enum SSKProtoError: Error { var attachments: [SSKProtoAttachmentPointer] = [] attachments = try proto.attachments.map { try SSKProtoAttachmentPointer.parseProto($0) } - var group: SSKProtoGroupContext? + var group: SSKProtoGroupContext? = nil if proto.hasGroup { group = try SSKProtoGroupContext.parseProto(proto.group) } - var quote: SSKProtoDataMessageQuote? + var quote: SSKProtoDataMessageQuote? = nil if proto.hasQuote { quote = try SSKProtoDataMessageQuote.parseProto(proto.quote) } @@ -2363,6 +2313,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoDataMessage { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoDataMessage.SSKProtoDataMessageBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoDataMessage? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoNullMessage @objc public class SSKProtoNullMessage: NSObject { @@ -2379,15 +2345,6 @@ public enum SSKProtoError: Error { proto.padding = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoNullMessage? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoNullMessage { return try SSKProtoNullMessage.parseProto(proto) } @@ -2413,15 +2370,6 @@ public enum SSKProtoError: Error { self.proto = proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -2442,6 +2390,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoNullMessage { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoNullMessage.SSKProtoNullMessageBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoNullMessage? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoReceiptMessage @objc public class SSKProtoReceiptMessage: NSObject { @@ -2496,15 +2460,6 @@ public enum SSKProtoError: Error { proto.timestamp = wrappedItems } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoReceiptMessage? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoReceiptMessage { return try SSKProtoReceiptMessage.parseProto(proto) } @@ -2528,15 +2483,6 @@ public enum SSKProtoError: Error { self.type = type } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -2563,6 +2509,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoReceiptMessage { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoReceiptMessage.SSKProtoReceiptMessageBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoReceiptMessage? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoVerified @objc public class SSKProtoVerified: NSObject { @@ -2622,15 +2584,6 @@ public enum SSKProtoError: Error { proto.nullMessage = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoVerified? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoVerified { return try SSKProtoVerified.parseProto(proto) } @@ -2677,15 +2630,6 @@ public enum SSKProtoError: Error { self.destination = destination } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -2712,6 +2656,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoVerified { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoVerified.SSKProtoVerifiedBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoVerified? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoSyncMessageSent @objc public class SSKProtoSyncMessageSent: NSObject { @@ -2740,15 +2700,6 @@ public enum SSKProtoError: Error { proto.expirationStartTimestamp = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageSent? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoSyncMessageSent { return try SSKProtoSyncMessageSent.parseProto(proto) } @@ -2792,15 +2743,6 @@ public enum SSKProtoError: Error { self.message = message } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -2812,7 +2754,7 @@ public enum SSKProtoError: Error { } fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.Sent) throws -> SSKProtoSyncMessageSent { - var message: SSKProtoDataMessage? + var message: SSKProtoDataMessage? = nil if proto.hasMessage { message = try SSKProtoDataMessage.parseProto(proto.message) } @@ -2827,6 +2769,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoSyncMessageSent { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageSent? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoSyncMessageContacts @objc public class SSKProtoSyncMessageContacts: NSObject { @@ -2854,15 +2812,6 @@ public enum SSKProtoError: Error { proto.isComplete = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageContacts? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoSyncMessageContacts { return try SSKProtoSyncMessageContacts.parseProto(proto) } @@ -2889,15 +2838,6 @@ public enum SSKProtoError: Error { self.blob = blob } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -2924,6 +2864,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoSyncMessageContacts { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoSyncMessageContacts.SSKProtoSyncMessageContactsBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageContacts? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoSyncMessageGroups @objc public class SSKProtoSyncMessageGroups: NSObject { @@ -2940,15 +2896,6 @@ public enum SSKProtoError: Error { proto.blob = valueParam.proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageGroups? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoSyncMessageGroups { return try SSKProtoSyncMessageGroups.parseProto(proto) } @@ -2968,15 +2915,6 @@ public enum SSKProtoError: Error { self.blob = blob } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -2988,7 +2926,7 @@ public enum SSKProtoError: Error { } fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.Groups) throws -> SSKProtoSyncMessageGroups { - var blob: SSKProtoAttachmentPointer? + var blob: SSKProtoAttachmentPointer? = nil if proto.hasBlob { blob = try SSKProtoAttachmentPointer.parseProto(proto.blob) } @@ -3003,6 +2941,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoSyncMessageGroups { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoSyncMessageGroups.SSKProtoSyncMessageGroupsBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageGroups? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoSyncMessageBlocked @objc public class SSKProtoSyncMessageBlocked: NSObject { @@ -3025,15 +2979,6 @@ public enum SSKProtoError: Error { proto.numbers = wrappedItems } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageBlocked? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoSyncMessageBlocked { return try SSKProtoSyncMessageBlocked.parseProto(proto) } @@ -3053,15 +2998,6 @@ public enum SSKProtoError: Error { self.proto = proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -3082,6 +3018,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoSyncMessageBlocked { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoSyncMessageBlocked.SSKProtoSyncMessageBlockedBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageBlocked? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoSyncMessageRequest @objc public class SSKProtoSyncMessageRequest: NSObject { @@ -3135,15 +3087,6 @@ public enum SSKProtoError: Error { proto.type = SSKProtoSyncMessageRequestTypeUnwrap(valueParam) } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageRequest? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoSyncMessageRequest { return try SSKProtoSyncMessageRequest.parseProto(proto) } @@ -3163,15 +3106,6 @@ public enum SSKProtoError: Error { self.type = type } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -3198,6 +3132,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoSyncMessageRequest { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoSyncMessageRequest.SSKProtoSyncMessageRequestBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageRequest? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoSyncMessageRead @objc public class SSKProtoSyncMessageRead: NSObject { @@ -3226,15 +3176,6 @@ public enum SSKProtoError: Error { proto.timestamp = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageRead? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoSyncMessageRead { return try SSKProtoSyncMessageRead.parseProto(proto) } @@ -3258,15 +3199,6 @@ public enum SSKProtoError: Error { self.timestamp = timestamp } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -3299,6 +3231,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoSyncMessageRead { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoSyncMessageRead.SSKProtoSyncMessageReadBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageRead? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoSyncMessageConfiguration @objc public class SSKProtoSyncMessageConfiguration: NSObject { @@ -3315,15 +3263,6 @@ public enum SSKProtoError: Error { proto.readReceipts = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageConfiguration? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoSyncMessageConfiguration { return try SSKProtoSyncMessageConfiguration.parseProto(proto) } @@ -3346,15 +3285,6 @@ public enum SSKProtoError: Error { self.proto = proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -3375,6 +3305,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoSyncMessageConfiguration { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoSyncMessageConfiguration? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoSyncMessage @objc public class SSKProtoSyncMessage: NSObject { @@ -3429,15 +3375,6 @@ public enum SSKProtoError: Error { proto.padding = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoSyncMessage? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoSyncMessage { return try SSKProtoSyncMessage.parseProto(proto) } @@ -3495,15 +3432,6 @@ public enum SSKProtoError: Error { self.configuration = configuration } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -3515,22 +3443,22 @@ public enum SSKProtoError: Error { } fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage) throws -> SSKProtoSyncMessage { - var sent: SSKProtoSyncMessageSent? + var sent: SSKProtoSyncMessageSent? = nil if proto.hasSent { sent = try SSKProtoSyncMessageSent.parseProto(proto.sent) } - var contacts: SSKProtoSyncMessageContacts? + var contacts: SSKProtoSyncMessageContacts? = nil if proto.hasContacts { contacts = try SSKProtoSyncMessageContacts.parseProto(proto.contacts) } - var groups: SSKProtoSyncMessageGroups? + var groups: SSKProtoSyncMessageGroups? = nil if proto.hasGroups { groups = try SSKProtoSyncMessageGroups.parseProto(proto.groups) } - var request: SSKProtoSyncMessageRequest? + var request: SSKProtoSyncMessageRequest? = nil if proto.hasRequest { request = try SSKProtoSyncMessageRequest.parseProto(proto.request) } @@ -3538,17 +3466,17 @@ public enum SSKProtoError: Error { var read: [SSKProtoSyncMessageRead] = [] read = try proto.read.map { try SSKProtoSyncMessageRead.parseProto($0) } - var blocked: SSKProtoSyncMessageBlocked? + var blocked: SSKProtoSyncMessageBlocked? = nil if proto.hasBlocked { blocked = try SSKProtoSyncMessageBlocked.parseProto(proto.blocked) } - var verified: SSKProtoVerified? + var verified: SSKProtoVerified? = nil if proto.hasVerified { verified = try SSKProtoVerified.parseProto(proto.verified) } - var configuration: SSKProtoSyncMessageConfiguration? + var configuration: SSKProtoSyncMessageConfiguration? = nil if proto.hasConfiguration { configuration = try SSKProtoSyncMessageConfiguration.parseProto(proto.configuration) } @@ -3570,6 +3498,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoSyncMessage { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoSyncMessage.SSKProtoSyncMessageBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoSyncMessage? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoAttachmentPointer @objc public class SSKProtoAttachmentPointer: NSObject { @@ -3647,15 +3591,6 @@ public enum SSKProtoError: Error { proto.height = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoAttachmentPointer? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoAttachmentPointer { return try SSKProtoAttachmentPointer.parseProto(proto) } @@ -3753,15 +3688,6 @@ public enum SSKProtoError: Error { self.id = id } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -3788,6 +3714,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoAttachmentPointer { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoAttachmentPointer.SSKProtoAttachmentPointerBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoAttachmentPointer? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoGroupContext @objc public class SSKProtoGroupContext: NSObject { @@ -3864,15 +3806,6 @@ public enum SSKProtoError: Error { proto.avatar = valueParam.proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoGroupContext? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoGroupContext { return try SSKProtoGroupContext.parseProto(proto) } @@ -3914,15 +3847,6 @@ public enum SSKProtoError: Error { self.avatar = avatar } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -3944,7 +3868,7 @@ public enum SSKProtoError: Error { } let type = SSKProtoGroupContextTypeWrap(proto.type) - var avatar: SSKProtoAttachmentPointer? + var avatar: SSKProtoAttachmentPointer? = nil if proto.hasAvatar { avatar = try SSKProtoAttachmentPointer.parseProto(proto.avatar) } @@ -3961,6 +3885,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoGroupContext { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoGroupContext.SSKProtoGroupContextBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoGroupContext? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoContactDetailsAvatar @objc public class SSKProtoContactDetailsAvatar: NSObject { @@ -3981,15 +3921,6 @@ public enum SSKProtoError: Error { proto.length = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoContactDetailsAvatar? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoContactDetailsAvatar { return try SSKProtoContactDetailsAvatar.parseProto(proto) } @@ -4022,15 +3953,6 @@ public enum SSKProtoError: Error { self.proto = proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -4051,6 +3973,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoContactDetailsAvatar { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoContactDetailsAvatar.SSKProtoContactDetailsAvatarBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoContactDetailsAvatar? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoContactDetails @objc public class SSKProtoContactDetails: NSObject { @@ -4102,15 +4040,6 @@ public enum SSKProtoError: Error { proto.expireTimer = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoContactDetails? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoContactDetails { return try SSKProtoContactDetails.parseProto(proto) } @@ -4182,15 +4111,6 @@ public enum SSKProtoError: Error { self.verified = verified } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -4207,12 +4127,12 @@ public enum SSKProtoError: Error { } let number = proto.number - var avatar: SSKProtoContactDetailsAvatar? + var avatar: SSKProtoContactDetailsAvatar? = nil if proto.hasAvatar { avatar = try SSKProtoContactDetailsAvatar.parseProto(proto.avatar) } - var verified: SSKProtoVerified? + var verified: SSKProtoVerified? = nil if proto.hasVerified { verified = try SSKProtoVerified.parseProto(proto.verified) } @@ -4229,6 +4149,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoContactDetails { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoContactDetails.SSKProtoContactDetailsBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoContactDetails? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoGroupDetailsAvatar @objc public class SSKProtoGroupDetailsAvatar: NSObject { @@ -4249,15 +4185,6 @@ public enum SSKProtoError: Error { proto.length = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoGroupDetailsAvatar? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoGroupDetailsAvatar { return try SSKProtoGroupDetailsAvatar.parseProto(proto) } @@ -4290,15 +4217,6 @@ public enum SSKProtoError: Error { self.proto = proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -4319,6 +4237,22 @@ public enum SSKProtoError: Error { } } +#if DEBUG + +extension SSKProtoGroupDetailsAvatar { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoGroupDetailsAvatar.SSKProtoGroupDetailsAvatarBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoGroupDetailsAvatar? { + return try! self.build() + } +} + +#endif + // MARK: - SSKProtoGroupDetails @objc public class SSKProtoGroupDetails: NSObject { @@ -4372,15 +4306,6 @@ public enum SSKProtoError: Error { proto.color = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SSKProtoGroupDetails? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SSKProtoGroupDetails { return try SSKProtoGroupDetails.parseProto(proto) } @@ -4442,15 +4367,6 @@ public enum SSKProtoError: Error { self.avatar = avatar } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -4467,7 +4383,7 @@ public enum SSKProtoError: Error { } let id = proto.id - var avatar: SSKProtoGroupDetailsAvatar? + var avatar: SSKProtoGroupDetailsAvatar? = nil if proto.hasAvatar { avatar = try SSKProtoGroupDetailsAvatar.parseProto(proto.avatar) } @@ -4482,3 +4398,19 @@ public enum SSKProtoError: Error { return result } } + +#if DEBUG + +extension SSKProtoGroupDetails { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SSKProtoGroupDetails.SSKProtoGroupDetailsBuilder { + @objc public func buildIgnoringErrors() -> SSKProtoGroupDetails? { + return try! self.build() + } +} + +#endif diff --git a/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift b/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift index 36ae558e8..2b5093aac 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift @@ -68,15 +68,6 @@ public enum SignalIOSProtoError: Error { proto.entityData = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SignalIOSProtoBackupSnapshotBackupEntity? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SignalIOSProtoBackupSnapshotBackupEntity { return try SignalIOSProtoBackupSnapshotBackupEntity.parseProto(proto) } @@ -100,15 +91,6 @@ public enum SignalIOSProtoError: Error { self.entityData = entityData } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -141,6 +123,22 @@ public enum SignalIOSProtoError: Error { } } +#if DEBUG + +extension SignalIOSProtoBackupSnapshotBackupEntity { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SignalIOSProtoBackupSnapshotBackupEntity.SignalIOSProtoBackupSnapshotBackupEntityBuilder { + @objc public func buildIgnoringErrors() -> SignalIOSProtoBackupSnapshotBackupEntity? { + return try! self.build() + } +} + +#endif + // MARK: - SignalIOSProtoBackupSnapshot @objc public class SignalIOSProtoBackupSnapshot: NSObject { @@ -163,15 +161,6 @@ public enum SignalIOSProtoError: Error { proto.entity = wrappedItems.map { $0.proto } } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> SignalIOSProtoBackupSnapshot? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> SignalIOSProtoBackupSnapshot { return try SignalIOSProtoBackupSnapshot.parseProto(proto) } @@ -191,15 +180,6 @@ public enum SignalIOSProtoError: Error { self.entity = entity } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -223,3 +203,19 @@ public enum SignalIOSProtoError: Error { return result } } + +#if DEBUG + +extension SignalIOSProtoBackupSnapshot { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension SignalIOSProtoBackupSnapshot.SignalIOSProtoBackupSnapshotBuilder { + @objc public func buildIgnoringErrors() -> SignalIOSProtoBackupSnapshot? { + return try! self.build() + } +} + +#endif diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift index dcc1b24f2..0e8de14c2 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift @@ -149,14 +149,6 @@ struct SignalServiceProtos_Envelope { fileprivate var _content: Data? = nil } -#if swift(>=4.2) - -extension SignalServiceProtos_Envelope.TypeEnum: CaseIterable { - // Support synthesized by the compiler. -} - -#endif // swift(>=4.2) - struct SignalServiceProtos_Content { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for @@ -1108,14 +1100,6 @@ struct SignalServiceProtos_DataMessage { fileprivate var _storage = _StorageClass.defaultInstance } -#if swift(>=4.2) - -extension SignalServiceProtos_DataMessage.Flags: CaseIterable { - // Support synthesized by the compiler. -} - -#endif // swift(>=4.2) - struct SignalServiceProtos_NullMessage { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for @@ -1187,14 +1171,6 @@ struct SignalServiceProtos_ReceiptMessage { fileprivate var _type: SignalServiceProtos_ReceiptMessage.TypeEnum? = nil } -#if swift(>=4.2) - -extension SignalServiceProtos_ReceiptMessage.TypeEnum: CaseIterable { - // Support synthesized by the compiler. -} - -#endif // swift(>=4.2) - struct SignalServiceProtos_Verified { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for @@ -1276,14 +1252,6 @@ struct SignalServiceProtos_Verified { fileprivate var _nullMessage: Data? = nil } -#if swift(>=4.2) - -extension SignalServiceProtos_Verified.State: CaseIterable { - // Support synthesized by the compiler. -} - -#endif // swift(>=4.2) - struct SignalServiceProtos_SyncMessage { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for @@ -1732,14 +1700,6 @@ struct SignalServiceProtos_AttachmentPointer { fileprivate var _height: UInt32? = nil } -#if swift(>=4.2) - -extension SignalServiceProtos_AttachmentPointer.Flags: CaseIterable { - // Support synthesized by the compiler. -} - -#endif // swift(>=4.2) - struct SignalServiceProtos_GroupContext { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for @@ -1830,14 +1790,6 @@ struct SignalServiceProtos_GroupContext { fileprivate var _storage = _StorageClass.defaultInstance } -#if swift(>=4.2) - -extension SignalServiceProtos_GroupContext.TypeEnum: CaseIterable { - // Support synthesized by the compiler. -} - -#endif // swift(>=4.2) - struct SignalServiceProtos_ContactDetails { // 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/WebSocketProto.swift b/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift index 01652cc35..2033c7946 100644 --- a/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift +++ b/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift @@ -57,15 +57,6 @@ public enum WebSocketProtoError: Error { proto.requestID = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> WebSocketProtoWebSocketRequestMessage? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> WebSocketProtoWebSocketRequestMessage { return try WebSocketProtoWebSocketRequestMessage.parseProto(proto) } @@ -107,15 +98,6 @@ public enum WebSocketProtoError: Error { self.requestID = requestID } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -154,6 +136,22 @@ public enum WebSocketProtoError: Error { } } +#if DEBUG + +extension WebSocketProtoWebSocketRequestMessage { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension WebSocketProtoWebSocketRequestMessage.WebSocketProtoWebSocketRequestMessageBuilder { + @objc public func buildIgnoringErrors() -> WebSocketProtoWebSocketRequestMessage? { + return try! self.build() + } +} + +#endif + // MARK: - WebSocketProtoWebSocketResponseMessage @objc public class WebSocketProtoWebSocketResponseMessage: NSObject { @@ -200,15 +198,6 @@ public enum WebSocketProtoError: Error { proto.body = valueParam } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> WebSocketProtoWebSocketResponseMessage? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> WebSocketProtoWebSocketResponseMessage { return try WebSocketProtoWebSocketResponseMessage.parseProto(proto) } @@ -256,15 +245,6 @@ public enum WebSocketProtoError: Error { self.status = status } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -297,6 +277,22 @@ public enum WebSocketProtoError: Error { } } +#if DEBUG + +extension WebSocketProtoWebSocketResponseMessage { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension WebSocketProtoWebSocketResponseMessage.WebSocketProtoWebSocketResponseMessageBuilder { + @objc public func buildIgnoringErrors() -> WebSocketProtoWebSocketResponseMessage? { + return try! self.build() + } +} + +#endif + // MARK: - WebSocketProtoWebSocketMessage @objc public class WebSocketProtoWebSocketMessage: NSObject { @@ -352,15 +348,6 @@ public enum WebSocketProtoError: Error { proto.response = valueParam.proto } - // NOTE: This method is intended for debugging purposes only. - @objc public func buildIgnoringErrors() -> WebSocketProtoWebSocketMessage? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.build() - } - @objc public func build() throws -> WebSocketProtoWebSocketMessage { return try WebSocketProtoWebSocketMessage.parseProto(proto) } @@ -388,15 +375,6 @@ public enum WebSocketProtoError: Error { self.response = response } - // NOTE: This method is intended for debugging purposes only. - @objc public func serializedDataIgnoringErrors() -> Data? { - guard _isDebugAssertConfiguration() else { - return nil - } - - return try! self.serializedData() - } - @objc public func serializedData() throws -> Data { return try self.proto.serializedData() @@ -413,12 +391,12 @@ public enum WebSocketProtoError: Error { } let type = WebSocketProtoWebSocketMessageTypeWrap(proto.type) - var request: WebSocketProtoWebSocketRequestMessage? + var request: WebSocketProtoWebSocketRequestMessage? = nil if proto.hasRequest { request = try WebSocketProtoWebSocketRequestMessage.parseProto(proto.request) } - var response: WebSocketProtoWebSocketResponseMessage? + var response: WebSocketProtoWebSocketResponseMessage? = nil if proto.hasResponse { response = try WebSocketProtoWebSocketResponseMessage.parseProto(proto.response) } @@ -434,3 +412,19 @@ public enum WebSocketProtoError: Error { return result } } + +#if DEBUG + +extension WebSocketProtoWebSocketMessage { + @objc public func serializedDataIgnoringErrors() -> Data? { + return try! self.serializedData() + } +} + +extension WebSocketProtoWebSocketMessage.WebSocketProtoWebSocketMessageBuilder { + @objc public func buildIgnoringErrors() -> WebSocketProtoWebSocketMessage? { + return try! self.build() + } +} + +#endif diff --git a/SignalServiceKit/src/Protos/Generated/WebSocketResources.pb.swift b/SignalServiceKit/src/Protos/Generated/WebSocketResources.pb.swift index e9f79bf87..8d9dd27ff 100644 --- a/SignalServiceKit/src/Protos/Generated/WebSocketResources.pb.swift +++ b/SignalServiceKit/src/Protos/Generated/WebSocketResources.pb.swift @@ -207,14 +207,6 @@ struct WebSocketProtos_WebSocketMessage { fileprivate var _storage = _StorageClass.defaultInstance } -#if swift(>=4.2) - -extension WebSocketProtos_WebSocketMessage.TypeEnum: CaseIterable { - // Support synthesized by the compiler. -} - -#endif // swift(>=4.2) - // MARK: - Code below here is support for the SwiftProtobuf runtime. fileprivate let _protobuf_package = "WebSocketProtos"