From ad56be27c90f62c4d2a1b65a2fd433463b31702d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 5 Oct 2018 09:20:30 -0400 Subject: [PATCH] Fix missing server timestamps. --- Podfile.lock | 4 +- .../Protos/Generated/FingerprintProto.swift | 8 ++ .../Protos/Generated/ProvisioningProto.swift | 8 ++ .../src/Protos/Generated/SSKProto.swift | 136 ++++++++++++++++++ .../src/Protos/Generated/SignalIOSProto.swift | 8 ++ .../src/Protos/Generated/WebSocketProto.swift | 16 ++- 6 files changed, 176 insertions(+), 4 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 2d47044d3..c249934bd 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -116,7 +116,7 @@ PODS: - SQLCipher/standard (3.4.2): - SQLCipher/common - SSZipArchive (2.1.3) - - SwiftProtobuf (1.1.0) + - SwiftProtobuf (1.1.2) - YapDatabase/SQLCipher (3.1.1): - YapDatabase/SQLCipher/Core (= 3.1.1) - YapDatabase/SQLCipher/Extensions (= 3.1.1) @@ -294,7 +294,7 @@ SPEC CHECKSUMS: SocketRocket: dbb1554b8fc288ef8ef370d6285aeca7361be31e SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990 SSZipArchive: 51a800ebb77f95a8329b6ced1faaff394b47f509 - SwiftProtobuf: f72e7c8b02f709da8c1a5661804ee1604ca504ae + SwiftProtobuf: 7147b8ec19c8c0694a45155d989ea9e6dedaf51f YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 diff --git a/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift b/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift index 7c568628b..cdc0257f0 100644 --- a/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift +++ b/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift @@ -85,6 +85,10 @@ public enum FingerprintProtoError: Error { identityData: identityData) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -208,6 +212,10 @@ extension FingerprintProtoLogicalFingerprint.FingerprintProtoLogicalFingerprintB remoteFingerprint: remoteFingerprint) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG diff --git a/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift b/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift index bef2bc3af..bb565de04 100644 --- a/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift +++ b/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift @@ -100,6 +100,10 @@ public enum ProvisioningProtoError: Error { body: body) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -283,6 +287,10 @@ extension ProvisioningProtoProvisionEnvelope.ProvisioningProtoProvisionEnvelopeB readReceipts: readReceipts) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift index e5627b211..3b9aa6493 100644 --- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift @@ -246,6 +246,10 @@ public enum SSKProtoError: Error { timestamp: timestamp) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -404,6 +408,10 @@ extension SSKProtoEnvelope.SSKProtoEnvelopeBuilder { receiptMessage: receiptMessage) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -512,6 +520,10 @@ extension SSKProtoContent.SSKProtoContentBuilder { sessionDescription: sessionDescription) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -620,6 +632,10 @@ extension SSKProtoCallMessageOffer.SSKProtoCallMessageOfferBuilder { sessionDescription: sessionDescription) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -758,6 +774,10 @@ extension SSKProtoCallMessageAnswer.SSKProtoCallMessageAnswerBuilder { sdp: sdp) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -851,6 +871,10 @@ extension SSKProtoCallMessageIceUpdate.SSKProtoCallMessageIceUpdateBuilder { id: id) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -944,6 +968,10 @@ extension SSKProtoCallMessageBusy.SSKProtoCallMessageBusyBuilder { id: id) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -1121,6 +1149,10 @@ extension SSKProtoCallMessageHangup.SSKProtoCallMessageHangupBuilder { busy: busy) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -1277,6 +1309,10 @@ extension SSKProtoCallMessage.SSKProtoCallMessageBuilder { thumbnail: thumbnail) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -1421,6 +1457,10 @@ extension SSKProtoDataMessageQuoteQuotedAttachment.SSKProtoDataMessageQuoteQuote attachments: attachments) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -1596,6 +1636,10 @@ extension SSKProtoDataMessageQuote.SSKProtoDataMessageQuoteBuilder { let result = SSKProtoDataMessageContactName(proto: proto) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -1744,6 +1788,10 @@ extension SSKProtoDataMessageContactName.SSKProtoDataMessageContactNameBuilder { let result = SSKProtoDataMessageContactPhone(proto: proto) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -1892,6 +1940,10 @@ extension SSKProtoDataMessageContactPhone.SSKProtoDataMessageContactPhoneBuilder let result = SSKProtoDataMessageContactEmail(proto: proto) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -2139,6 +2191,10 @@ extension SSKProtoDataMessageContactEmail.SSKProtoDataMessageContactEmailBuilder let result = SSKProtoDataMessageContactPostalAddress(proto: proto) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -2243,6 +2299,10 @@ extension SSKProtoDataMessageContactPostalAddress.SSKProtoDataMessageContactPost avatar: avatar) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -2424,6 +2484,10 @@ extension SSKProtoDataMessageContactAvatar.SSKProtoDataMessageContactAvatarBuild avatar: avatar) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -2669,6 +2733,10 @@ extension SSKProtoDataMessageContact.SSKProtoDataMessageContactBuilder { contact: contact) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -2759,6 +2827,10 @@ extension SSKProtoDataMessage.SSKProtoDataMessageBuilder { let result = SSKProtoNullMessage(proto: proto) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -2888,6 +2960,10 @@ extension SSKProtoNullMessage.SSKProtoNullMessageBuilder { type: type) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -3053,6 +3129,10 @@ extension SSKProtoReceiptMessage.SSKProtoReceiptMessageBuilder { destination: destination) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -3188,6 +3268,10 @@ extension SSKProtoVerified.SSKProtoVerifiedBuilder { message: message) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -3295,6 +3379,10 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder { blob: blob) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -3385,6 +3473,10 @@ extension SSKProtoSyncMessageContacts.SSKProtoSyncMessageContactsBuilder { blob: blob) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -3488,6 +3580,10 @@ extension SSKProtoSyncMessageGroups.SSKProtoSyncMessageGroupsBuilder { let result = SSKProtoSyncMessageBlocked(proto: proto) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -3611,6 +3707,10 @@ extension SSKProtoSyncMessageBlocked.SSKProtoSyncMessageBlockedBuilder { type: type) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -3719,6 +3819,10 @@ extension SSKProtoSyncMessageRequest.SSKProtoSyncMessageRequestBuilder { timestamp: timestamp) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -3806,6 +3910,10 @@ extension SSKProtoSyncMessageRead.SSKProtoSyncMessageReadBuilder { let result = SSKProtoSyncMessageConfiguration(proto: proto) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -4034,6 +4142,10 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild configuration: configuration) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -4286,6 +4398,10 @@ extension SSKProtoSyncMessage.SSKProtoSyncMessageBuilder { id: id) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -4473,6 +4589,10 @@ extension SSKProtoAttachmentPointer.SSKProtoAttachmentPointerBuilder { avatar: avatar) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -4577,6 +4697,10 @@ extension SSKProtoGroupContext.SSKProtoGroupContextBuilder { let result = SSKProtoContactDetailsAvatar(proto: proto) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -4783,6 +4907,10 @@ extension SSKProtoContactDetailsAvatar.SSKProtoContactDetailsAvatarBuilder { verified: verified) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -4887,6 +5015,10 @@ extension SSKProtoContactDetails.SSKProtoContactDetailsBuilder { let result = SSKProtoGroupDetailsAvatar(proto: proto) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -5088,6 +5220,10 @@ extension SSKProtoGroupDetailsAvatar.SSKProtoGroupDetailsAvatarBuilder { avatar: avatar) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG diff --git a/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift b/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift index 839c9c3ea..497260032 100644 --- a/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift +++ b/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift @@ -130,6 +130,10 @@ public enum SignalIOSProtoError: Error { entityData: entityData) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -222,6 +226,10 @@ extension SignalIOSProtoBackupSnapshotBackupEntity.SignalIOSProtoBackupSnapshotB entity: entity) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG diff --git a/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift b/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift index d6d94b8e8..d93698ee8 100644 --- a/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift +++ b/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift @@ -147,6 +147,10 @@ public enum WebSocketProtoError: Error { requestID: requestID) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -304,6 +308,10 @@ extension WebSocketProtoWebSocketRequestMessage.WebSocketProtoWebSocketRequestMe status: status) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG @@ -435,12 +443,12 @@ extension WebSocketProtoWebSocketResponseMessage.WebSocketProtoWebSocketResponse } let type = WebSocketProtoWebSocketMessageTypeWrap(proto.type) - var request: WebSocketProtoWebSocketRequestMessage? = nil + var request: WebSocketProtoWebSocketRequestMessage? if proto.hasRequest { request = try WebSocketProtoWebSocketRequestMessage.parseProto(proto.request) } - var response: WebSocketProtoWebSocketResponseMessage? = nil + var response: WebSocketProtoWebSocketResponseMessage? if proto.hasResponse { response = try WebSocketProtoWebSocketResponseMessage.parseProto(proto.response) } @@ -455,6 +463,10 @@ extension WebSocketProtoWebSocketResponseMessage.WebSocketProtoWebSocketResponse response: response) return result } + + @objc public override var description: String { + return "\(proto)" + } } #if DEBUG