From 7441c565bb09d46d1c99d4a6d74216b3d40fb491 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 5 Oct 2018 09:25:09 -0400
Subject: [PATCH] Fix missing server timestamps.

---
 Scripts/ProtoWrappers.py                      |  13 +-
 .../Protos/Generated/FingerprintProto.swift   |   4 +-
 .../Protos/Generated/ProvisioningProto.swift  |   4 +-
 .../src/Protos/Generated/SSKProto.swift       | 124 +++---
 .../src/Protos/Generated/SignalIOSProto.swift |   4 +-
 .../Protos/Generated/SignalService.pb.swift   | 354 +++++++++---------
 .../src/Protos/Generated/WebSocketProto.swift |  10 +-
 7 files changed, 253 insertions(+), 260 deletions(-)

diff --git a/Scripts/ProtoWrappers.py b/Scripts/ProtoWrappers.py
index 03a7c8277..c35bbbe30 100755
--- a/Scripts/ProtoWrappers.py
+++ b/Scripts/ProtoWrappers.py
@@ -623,18 +623,7 @@ public func serializedData() throws -> Data {
         writer.newline()
 
         # description
-        if self.args.add_description:
-            writer.add('@objc public override var description: String {')
-            writer.push_indent()
-            writer.add('var fields = [String]()')
-            for field in self.fields():
-                writer.add('fields.append("%s: \(proto.%s)")' % ( field.name_swift, field.name_swift, ) )
-            writer.add('return "[" + fields.joined(separator: ", ") + "]"')
-            writer.pop_indent()
-            writer.add('}')
-            writer.newline()
-
-        writer.add('@objc public override var description: String {')
+        writer.add('@objc public override var debugDescription: String {')
         writer.push_indent()
         writer.add('return "\(proto)"')
         writer.pop_indent()
diff --git a/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift b/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift
index cdc0257f0..b841ce062 100644
--- a/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift
+++ b/SignalServiceKit/src/Protos/Generated/FingerprintProto.swift
@@ -86,7 +86,7 @@ public enum FingerprintProtoError: Error {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -213,7 +213,7 @@ extension FingerprintProtoLogicalFingerprint.FingerprintProtoLogicalFingerprintB
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
diff --git a/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift b/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift
index bb565de04..4b1f7c948 100644
--- a/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift
+++ b/SignalServiceKit/src/Protos/Generated/ProvisioningProto.swift
@@ -101,7 +101,7 @@ public enum ProvisioningProtoError: Error {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -288,7 +288,7 @@ extension ProvisioningProtoProvisionEnvelope.ProvisioningProtoProvisionEnvelopeB
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift
index 3b9aa6493..631220789 100644
--- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift
+++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift
@@ -247,7 +247,7 @@ public enum SSKProtoError: Error {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -371,27 +371,27 @@ extension SSKProtoEnvelope.SSKProtoEnvelopeBuilder {
     }
 
     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)
         }
@@ -409,7 +409,7 @@ extension SSKProtoEnvelope.SSKProtoEnvelopeBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -521,7 +521,7 @@ extension SSKProtoContent.SSKProtoContentBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -633,7 +633,7 @@ extension SSKProtoCallMessageOffer.SSKProtoCallMessageOfferBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -775,7 +775,7 @@ extension SSKProtoCallMessageAnswer.SSKProtoCallMessageAnswerBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -872,7 +872,7 @@ extension SSKProtoCallMessageIceUpdate.SSKProtoCallMessageIceUpdateBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -969,7 +969,7 @@ extension SSKProtoCallMessageBusy.SSKProtoCallMessageBusyBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -1114,12 +1114,12 @@ extension SSKProtoCallMessageHangup.SSKProtoCallMessageHangupBuilder {
     }
 
     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)
         }
@@ -1127,12 +1127,12 @@ extension SSKProtoCallMessageHangup.SSKProtoCallMessageHangupBuilder {
         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)
         }
@@ -1150,7 +1150,7 @@ extension SSKProtoCallMessageHangup.SSKProtoCallMessageHangupBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -1296,7 +1296,7 @@ extension SSKProtoCallMessage.SSKProtoCallMessageBuilder {
     }
 
     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)
         }
@@ -1310,7 +1310,7 @@ extension SSKProtoCallMessage.SSKProtoCallMessageBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -1458,7 +1458,7 @@ extension SSKProtoDataMessageQuoteQuotedAttachment.SSKProtoDataMessageQuoteQuote
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -1637,7 +1637,7 @@ extension SSKProtoDataMessageQuote.SSKProtoDataMessageQuoteBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -1789,7 +1789,7 @@ extension SSKProtoDataMessageContactName.SSKProtoDataMessageContactNameBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -1941,7 +1941,7 @@ extension SSKProtoDataMessageContactPhone.SSKProtoDataMessageContactPhoneBuilder
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -2192,7 +2192,7 @@ extension SSKProtoDataMessageContactEmail.SSKProtoDataMessageContactEmailBuilder
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -2286,7 +2286,7 @@ extension SSKProtoDataMessageContactPostalAddress.SSKProtoDataMessageContactPost
     }
 
     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)
         }
@@ -2300,7 +2300,7 @@ extension SSKProtoDataMessageContactPostalAddress.SSKProtoDataMessageContactPost
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -2453,7 +2453,7 @@ extension SSKProtoDataMessageContactAvatar.SSKProtoDataMessageContactAvatarBuild
     }
 
     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)
         }
@@ -2467,7 +2467,7 @@ extension SSKProtoDataMessageContactAvatar.SSKProtoDataMessageContactAvatarBuild
         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)
         }
@@ -2485,7 +2485,7 @@ extension SSKProtoDataMessageContactAvatar.SSKProtoDataMessageContactAvatarBuild
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -2709,12 +2709,12 @@ extension SSKProtoDataMessageContact.SSKProtoDataMessageContactBuilder {
         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)
         }
@@ -2734,7 +2734,7 @@ extension SSKProtoDataMessageContact.SSKProtoDataMessageContactBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -2828,7 +2828,7 @@ extension SSKProtoDataMessage.SSKProtoDataMessageBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -2961,7 +2961,7 @@ extension SSKProtoNullMessage.SSKProtoNullMessageBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -3130,7 +3130,7 @@ extension SSKProtoReceiptMessage.SSKProtoReceiptMessageBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -3255,7 +3255,7 @@ extension SSKProtoVerified.SSKProtoVerifiedBuilder {
     }
 
     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)
         }
@@ -3269,7 +3269,7 @@ extension SSKProtoVerified.SSKProtoVerifiedBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -3380,7 +3380,7 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -3460,7 +3460,7 @@ extension SSKProtoSyncMessageContacts.SSKProtoSyncMessageContactsBuilder {
     }
 
     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)
         }
@@ -3474,7 +3474,7 @@ extension SSKProtoSyncMessageContacts.SSKProtoSyncMessageContactsBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -3581,7 +3581,7 @@ extension SSKProtoSyncMessageGroups.SSKProtoSyncMessageGroupsBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -3708,7 +3708,7 @@ extension SSKProtoSyncMessageBlocked.SSKProtoSyncMessageBlockedBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -3820,7 +3820,7 @@ extension SSKProtoSyncMessageRequest.SSKProtoSyncMessageRequestBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -3911,7 +3911,7 @@ extension SSKProtoSyncMessageRead.SSKProtoSyncMessageReadBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -4089,22 +4089,22 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild
     }
 
     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)
         }
@@ -4112,17 +4112,17 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild
         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)
         }
@@ -4143,7 +4143,7 @@ extension SSKProtoSyncMessageConfiguration.SSKProtoSyncMessageConfigurationBuild
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -4399,7 +4399,7 @@ extension SSKProtoSyncMessage.SSKProtoSyncMessageBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -4574,7 +4574,7 @@ extension SSKProtoAttachmentPointer.SSKProtoAttachmentPointerBuilder {
         }
         let type = SSKProtoGroupContextTypeWrap(proto.type)
 
-        var avatar: SSKProtoAttachmentPointer?
+        var avatar: SSKProtoAttachmentPointer? = nil
         if proto.hasAvatar {
             avatar = try SSKProtoAttachmentPointer.parseProto(proto.avatar)
         }
@@ -4590,7 +4590,7 @@ extension SSKProtoAttachmentPointer.SSKProtoAttachmentPointerBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -4698,7 +4698,7 @@ extension SSKProtoGroupContext.SSKProtoGroupContextBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -4887,12 +4887,12 @@ extension SSKProtoContactDetailsAvatar.SSKProtoContactDetailsAvatarBuilder {
         }
         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)
         }
@@ -4908,7 +4908,7 @@ extension SSKProtoContactDetailsAvatar.SSKProtoContactDetailsAvatarBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -5016,7 +5016,7 @@ extension SSKProtoContactDetails.SSKProtoContactDetailsBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -5206,7 +5206,7 @@ extension SSKProtoGroupDetailsAvatar.SSKProtoGroupDetailsAvatarBuilder {
         }
         let id = proto.id
 
-        var avatar: SSKProtoGroupDetailsAvatar?
+        var avatar: SSKProtoGroupDetailsAvatar? = nil
         if proto.hasAvatar {
             avatar = try SSKProtoGroupDetailsAvatar.parseProto(proto.avatar)
         }
@@ -5221,7 +5221,7 @@ extension SSKProtoGroupDetailsAvatar.SSKProtoGroupDetailsAvatarBuilder {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
diff --git a/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift b/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift
index 497260032..ebd758b5a 100644
--- a/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift
+++ b/SignalServiceKit/src/Protos/Generated/SignalIOSProto.swift
@@ -131,7 +131,7 @@ public enum SignalIOSProtoError: Error {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -227,7 +227,7 @@ extension SignalIOSProtoBackupSnapshotBackupEntity.SignalIOSProtoBackupSnapshotB
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift
index 94d09cdb9..0ceadcc1b 100644
--- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift
+++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift
@@ -1,6 +1,10 @@
+// DO NOT EDIT.
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+// Generated by the Swift generator plugin for the protocol buffer compiler.
+// Source: SignalService.proto
 //
+// For information on using the generated types, please see the documenation:
+//   https://github.com/apple/swift-protobuf/
 
 //*
 // Copyright (C) 2014-2016 Open Whisper Systems
@@ -18,7 +22,7 @@ import SwiftProtobuf
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that your are building against the same version of the API
 // that was used to generate this file.
-private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
   struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
   typealias Version = _2
 }
@@ -157,15 +161,15 @@ struct SignalServiceProtos_Envelope {
 
   init() {}
 
-  fileprivate var _type: SignalServiceProtos_Envelope.TypeEnum?
-  fileprivate var _source: String?
-  fileprivate var _sourceDevice: UInt32?
-  fileprivate var _relay: String?
-  fileprivate var _timestamp: UInt64?
-  fileprivate var _legacyMessage: Data?
-  fileprivate var _content: Data?
-  fileprivate var _serverGuid: String?
-  fileprivate var _serverTimestamp: UInt64?
+  fileprivate var _type: SignalServiceProtos_Envelope.TypeEnum? = nil
+  fileprivate var _source: String? = nil
+  fileprivate var _sourceDevice: UInt32? = nil
+  fileprivate var _relay: String? = nil
+  fileprivate var _timestamp: UInt64? = nil
+  fileprivate var _legacyMessage: Data? = nil
+  fileprivate var _content: Data? = nil
+  fileprivate var _serverGuid: String? = nil
+  fileprivate var _serverTimestamp: UInt64? = nil
 }
 
 #if swift(>=4.2)
@@ -323,8 +327,8 @@ struct SignalServiceProtos_CallMessage {
 
     init() {}
 
-    fileprivate var _id: UInt64?
-    fileprivate var _sessionDescription: String?
+    fileprivate var _id: UInt64? = nil
+    fileprivate var _sessionDescription: String? = nil
   }
 
   struct Answer {
@@ -358,8 +362,8 @@ struct SignalServiceProtos_CallMessage {
 
     init() {}
 
-    fileprivate var _id: UInt64?
-    fileprivate var _sessionDescription: String?
+    fileprivate var _id: UInt64? = nil
+    fileprivate var _sessionDescription: String? = nil
   }
 
   struct IceUpdate {
@@ -411,10 +415,10 @@ struct SignalServiceProtos_CallMessage {
 
     init() {}
 
-    fileprivate var _id: UInt64?
-    fileprivate var _sdpMid: String?
-    fileprivate var _sdpMlineIndex: UInt32?
-    fileprivate var _sdp: String?
+    fileprivate var _id: UInt64? = nil
+    fileprivate var _sdpMid: String? = nil
+    fileprivate var _sdpMlineIndex: UInt32? = nil
+    fileprivate var _sdp: String? = nil
   }
 
   struct Busy {
@@ -436,7 +440,7 @@ struct SignalServiceProtos_CallMessage {
 
     init() {}
 
-    fileprivate var _id: UInt64?
+    fileprivate var _id: UInt64? = nil
   }
 
   struct Hangup {
@@ -458,7 +462,7 @@ struct SignalServiceProtos_CallMessage {
 
     init() {}
 
-    fileprivate var _id: UInt64?
+    fileprivate var _id: UInt64? = nil
   }
 
   init() {}
@@ -686,9 +690,9 @@ struct SignalServiceProtos_DataMessage {
 
     init() {}
 
-    fileprivate var _id: UInt64?
-    fileprivate var _author: String?
-    fileprivate var _text: String?
+    fileprivate var _id: UInt64? = nil
+    fileprivate var _author: String? = nil
+    fileprivate var _text: String? = nil
   }
 
   struct Contact {
@@ -803,12 +807,12 @@ struct SignalServiceProtos_DataMessage {
 
       init() {}
 
-      fileprivate var _givenName: String?
-      fileprivate var _familyName: String?
-      fileprivate var _prefix: String?
-      fileprivate var _suffix: String?
-      fileprivate var _middleName: String?
-      fileprivate var _displayName: String?
+      fileprivate var _givenName: String? = nil
+      fileprivate var _familyName: String? = nil
+      fileprivate var _prefix: String? = nil
+      fileprivate var _suffix: String? = nil
+      fileprivate var _middleName: String? = nil
+      fileprivate var _displayName: String? = nil
     }
 
     struct Phone {
@@ -879,9 +883,9 @@ struct SignalServiceProtos_DataMessage {
 
       init() {}
 
-      fileprivate var _value: String?
-      fileprivate var _type: SignalServiceProtos_DataMessage.Contact.Phone.TypeEnum?
-      fileprivate var _label: String?
+      fileprivate var _value: String? = nil
+      fileprivate var _type: SignalServiceProtos_DataMessage.Contact.Phone.TypeEnum? = nil
+      fileprivate var _label: String? = nil
     }
 
     struct Email {
@@ -952,9 +956,9 @@ struct SignalServiceProtos_DataMessage {
 
       init() {}
 
-      fileprivate var _value: String?
-      fileprivate var _type: SignalServiceProtos_DataMessage.Contact.Email.TypeEnum?
-      fileprivate var _label: String?
+      fileprivate var _value: String? = nil
+      fileprivate var _type: SignalServiceProtos_DataMessage.Contact.Email.TypeEnum? = nil
+      fileprivate var _label: String? = nil
     }
 
     struct PostalAddress {
@@ -1076,15 +1080,15 @@ struct SignalServiceProtos_DataMessage {
 
       init() {}
 
-      fileprivate var _type: SignalServiceProtos_DataMessage.Contact.PostalAddress.TypeEnum?
-      fileprivate var _label: String?
-      fileprivate var _street: String?
-      fileprivate var _pobox: String?
-      fileprivate var _neighborhood: String?
-      fileprivate var _city: String?
-      fileprivate var _region: String?
-      fileprivate var _postcode: String?
-      fileprivate var _country: String?
+      fileprivate var _type: SignalServiceProtos_DataMessage.Contact.PostalAddress.TypeEnum? = nil
+      fileprivate var _label: String? = nil
+      fileprivate var _street: String? = nil
+      fileprivate var _pobox: String? = nil
+      fileprivate var _neighborhood: String? = nil
+      fileprivate var _city: String? = nil
+      fileprivate var _region: String? = nil
+      fileprivate var _postcode: String? = nil
+      fileprivate var _country: String? = nil
     }
 
     struct Avatar {
@@ -1153,7 +1157,7 @@ struct SignalServiceProtos_NullMessage {
 
   init() {}
 
-  fileprivate var _padding: Data?
+  fileprivate var _padding: Data? = nil
 }
 
 struct SignalServiceProtos_ReceiptMessage {
@@ -1203,7 +1207,7 @@ struct SignalServiceProtos_ReceiptMessage {
 
   init() {}
 
-  fileprivate var _type: SignalServiceProtos_ReceiptMessage.TypeEnum?
+  fileprivate var _type: SignalServiceProtos_ReceiptMessage.TypeEnum? = nil
 }
 
 #if swift(>=4.2)
@@ -1289,10 +1293,10 @@ struct SignalServiceProtos_Verified {
 
   init() {}
 
-  fileprivate var _destination: String?
-  fileprivate var _identityKey: Data?
-  fileprivate var _state: SignalServiceProtos_Verified.State?
-  fileprivate var _nullMessage: Data?
+  fileprivate var _destination: String? = nil
+  fileprivate var _identityKey: Data? = nil
+  fileprivate var _state: SignalServiceProtos_Verified.State? = nil
+  fileprivate var _nullMessage: Data? = nil
 }
 
 #if swift(>=4.2)
@@ -1556,7 +1560,7 @@ struct SignalServiceProtos_SyncMessage {
 
     init() {}
 
-    fileprivate var _type: SignalServiceProtos_SyncMessage.Request.TypeEnum?
+    fileprivate var _type: SignalServiceProtos_SyncMessage.Request.TypeEnum? = nil
   }
 
   struct Read {
@@ -1588,8 +1592,8 @@ struct SignalServiceProtos_SyncMessage {
 
     init() {}
 
-    fileprivate var _sender: String?
-    fileprivate var _timestamp: UInt64?
+    fileprivate var _sender: String? = nil
+    fileprivate var _timestamp: UInt64? = nil
   }
 
   struct Configuration {
@@ -1610,7 +1614,7 @@ struct SignalServiceProtos_SyncMessage {
 
     init() {}
 
-    fileprivate var _readReceipts: Bool?
+    fileprivate var _readReceipts: Bool? = nil
   }
 
   init() {}
@@ -1741,16 +1745,16 @@ struct SignalServiceProtos_AttachmentPointer {
 
   init() {}
 
-  fileprivate var _id: UInt64?
-  fileprivate var _contentType: String?
-  fileprivate var _key: Data?
-  fileprivate var _size: UInt32?
-  fileprivate var _thumbnail: Data?
-  fileprivate var _digest: Data?
-  fileprivate var _fileName: String?
-  fileprivate var _flags: UInt32?
-  fileprivate var _width: UInt32?
-  fileprivate var _height: UInt32?
+  fileprivate var _id: UInt64? = nil
+  fileprivate var _contentType: String? = nil
+  fileprivate var _key: Data? = nil
+  fileprivate var _size: UInt32? = nil
+  fileprivate var _thumbnail: Data? = nil
+  fileprivate var _digest: Data? = nil
+  fileprivate var _fileName: String? = nil
+  fileprivate var _flags: UInt32? = nil
+  fileprivate var _width: UInt32? = nil
+  fileprivate var _height: UInt32? = nil
 }
 
 #if swift(>=4.2)
@@ -1966,8 +1970,8 @@ struct SignalServiceProtos_ContactDetails {
 
     init() {}
 
-    fileprivate var _contentType: String?
-    fileprivate var _length: UInt32?
+    fileprivate var _contentType: String? = nil
+    fileprivate var _length: UInt32? = nil
   }
 
   init() {}
@@ -2078,8 +2082,8 @@ struct SignalServiceProtos_GroupDetails {
 
     init() {}
 
-    fileprivate var _contentType: String?
-    fileprivate var _length: UInt32?
+    fileprivate var _contentType: String? = nil
+    fileprivate var _length: UInt32? = nil
   }
 
   init() {}
@@ -2089,7 +2093,7 @@ struct SignalServiceProtos_GroupDetails {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-private let _protobuf_package = "SignalServiceProtos"
+fileprivate let _protobuf_package = "SignalServiceProtos"
 
 extension SignalServiceProtos_Envelope: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".Envelope"
@@ -2102,7 +2106,7 @@ extension SignalServiceProtos_Envelope: SwiftProtobuf.Message, SwiftProtobuf._Me
     6: .same(proto: "legacyMessage"),
     8: .same(proto: "content"),
     9: .same(proto: "serverGuid"),
-    10: .same(proto: "serverTimestamp")
+    10: .same(proto: "serverTimestamp"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -2175,7 +2179,7 @@ extension SignalServiceProtos_Envelope.TypeEnum: SwiftProtobuf._ProtoNameProvidi
     2: .same(proto: "KEY_EXCHANGE"),
     3: .same(proto: "PREKEY_BUNDLE"),
     5: .same(proto: "RECEIPT"),
-    6: .same(proto: "UNIDENTIFIED_SENDER")
+    6: .same(proto: "UNIDENTIFIED_SENDER"),
   ]
 }
 
@@ -2186,15 +2190,15 @@ extension SignalServiceProtos_Content: SwiftProtobuf.Message, SwiftProtobuf._Mes
     2: .same(proto: "syncMessage"),
     3: .same(proto: "callMessage"),
     4: .same(proto: "nullMessage"),
-    5: .same(proto: "receiptMessage")
+    5: .same(proto: "receiptMessage"),
   ]
 
   fileprivate class _StorageClass {
-    var _dataMessage: SignalServiceProtos_DataMessage?
-    var _syncMessage: SignalServiceProtos_SyncMessage?
-    var _callMessage: SignalServiceProtos_CallMessage?
-    var _nullMessage: SignalServiceProtos_NullMessage?
-    var _receiptMessage: SignalServiceProtos_ReceiptMessage?
+    var _dataMessage: SignalServiceProtos_DataMessage? = nil
+    var _syncMessage: SignalServiceProtos_SyncMessage? = nil
+    var _callMessage: SignalServiceProtos_CallMessage? = nil
+    var _nullMessage: SignalServiceProtos_NullMessage? = nil
+    var _receiptMessage: SignalServiceProtos_ReceiptMessage? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -2280,16 +2284,16 @@ extension SignalServiceProtos_CallMessage: SwiftProtobuf.Message, SwiftProtobuf.
     3: .same(proto: "iceUpdate"),
     4: .same(proto: "hangup"),
     5: .same(proto: "busy"),
-    6: .same(proto: "profileKey")
+    6: .same(proto: "profileKey"),
   ]
 
   fileprivate class _StorageClass {
-    var _offer: SignalServiceProtos_CallMessage.Offer?
-    var _answer: SignalServiceProtos_CallMessage.Answer?
+    var _offer: SignalServiceProtos_CallMessage.Offer? = nil
+    var _answer: SignalServiceProtos_CallMessage.Answer? = nil
     var _iceUpdate: [SignalServiceProtos_CallMessage.IceUpdate] = []
-    var _hangup: SignalServiceProtos_CallMessage.Hangup?
-    var _busy: SignalServiceProtos_CallMessage.Busy?
-    var _profileKey: Data?
+    var _hangup: SignalServiceProtos_CallMessage.Hangup? = nil
+    var _busy: SignalServiceProtos_CallMessage.Busy? = nil
+    var _profileKey: Data? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -2377,7 +2381,7 @@ extension SignalServiceProtos_CallMessage.Offer: SwiftProtobuf.Message, SwiftPro
   static let protoMessageName: String = SignalServiceProtos_CallMessage.protoMessageName + ".Offer"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "id"),
-    2: .same(proto: "sessionDescription")
+    2: .same(proto: "sessionDescription"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -2412,7 +2416,7 @@ extension SignalServiceProtos_CallMessage.Answer: SwiftProtobuf.Message, SwiftPr
   static let protoMessageName: String = SignalServiceProtos_CallMessage.protoMessageName + ".Answer"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "id"),
-    2: .same(proto: "sessionDescription")
+    2: .same(proto: "sessionDescription"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -2449,7 +2453,7 @@ extension SignalServiceProtos_CallMessage.IceUpdate: SwiftProtobuf.Message, Swif
     1: .same(proto: "id"),
     2: .same(proto: "sdpMid"),
     3: .same(proto: "sdpMLineIndex"),
-    4: .same(proto: "sdp")
+    4: .same(proto: "sdp"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -2493,7 +2497,7 @@ extension SignalServiceProtos_CallMessage.IceUpdate: SwiftProtobuf.Message, Swif
 extension SignalServiceProtos_CallMessage.Busy: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SignalServiceProtos_CallMessage.protoMessageName + ".Busy"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "id")
+    1: .same(proto: "id"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -2522,7 +2526,7 @@ extension SignalServiceProtos_CallMessage.Busy: SwiftProtobuf.Message, SwiftProt
 extension SignalServiceProtos_CallMessage.Hangup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SignalServiceProtos_CallMessage.protoMessageName + ".Hangup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "id")
+    1: .same(proto: "id"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -2559,18 +2563,18 @@ extension SignalServiceProtos_DataMessage: SwiftProtobuf.Message, SwiftProtobuf.
     6: .same(proto: "profileKey"),
     7: .same(proto: "timestamp"),
     8: .same(proto: "quote"),
-    9: .same(proto: "contact")
+    9: .same(proto: "contact"),
   ]
 
   fileprivate class _StorageClass {
-    var _body: String?
+    var _body: String? = nil
     var _attachments: [SignalServiceProtos_AttachmentPointer] = []
-    var _group: SignalServiceProtos_GroupContext?
-    var _flags: UInt32?
-    var _expireTimer: UInt32?
-    var _profileKey: Data?
-    var _timestamp: UInt64?
-    var _quote: SignalServiceProtos_DataMessage.Quote?
+    var _group: SignalServiceProtos_GroupContext? = nil
+    var _flags: UInt32? = nil
+    var _expireTimer: UInt32? = nil
+    var _profileKey: Data? = nil
+    var _timestamp: UInt64? = nil
+    var _quote: SignalServiceProtos_DataMessage.Quote? = nil
     var _contact: [SignalServiceProtos_DataMessage.Contact] = []
 
     static let defaultInstance = _StorageClass()
@@ -2677,7 +2681,7 @@ extension SignalServiceProtos_DataMessage.Flags: SwiftProtobuf._ProtoNameProvidi
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "END_SESSION"),
     2: .same(proto: "EXPIRATION_TIMER_UPDATE"),
-    4: .same(proto: "PROFILE_KEY_UPDATE")
+    4: .same(proto: "PROFILE_KEY_UPDATE"),
   ]
 }
 
@@ -2687,7 +2691,7 @@ extension SignalServiceProtos_DataMessage.Quote: SwiftProtobuf.Message, SwiftPro
     1: .same(proto: "id"),
     2: .same(proto: "author"),
     3: .same(proto: "text"),
-    4: .same(proto: "attachments")
+    4: .same(proto: "attachments"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -2734,14 +2738,14 @@ extension SignalServiceProtos_DataMessage.Quote.QuotedAttachment: SwiftProtobuf.
     1: .same(proto: "contentType"),
     2: .same(proto: "fileName"),
     3: .same(proto: "thumbnail"),
-    4: .same(proto: "flags")
+    4: .same(proto: "flags"),
   ]
 
   fileprivate class _StorageClass {
-    var _contentType: String?
-    var _fileName: String?
-    var _thumbnail: SignalServiceProtos_AttachmentPointer?
-    var _flags: UInt32?
+    var _contentType: String? = nil
+    var _fileName: String? = nil
+    var _thumbnail: SignalServiceProtos_AttachmentPointer? = nil
+    var _flags: UInt32? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -2815,7 +2819,7 @@ extension SignalServiceProtos_DataMessage.Quote.QuotedAttachment: SwiftProtobuf.
 
 extension SignalServiceProtos_DataMessage.Quote.QuotedAttachment.Flags: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "VOICE_MESSAGE")
+    1: .same(proto: "VOICE_MESSAGE"),
   ]
 }
 
@@ -2827,16 +2831,16 @@ extension SignalServiceProtos_DataMessage.Contact: SwiftProtobuf.Message, SwiftP
     4: .same(proto: "email"),
     5: .same(proto: "address"),
     6: .same(proto: "avatar"),
-    7: .same(proto: "organization")
+    7: .same(proto: "organization"),
   ]
 
   fileprivate class _StorageClass {
-    var _name: SignalServiceProtos_DataMessage.Contact.Name?
+    var _name: SignalServiceProtos_DataMessage.Contact.Name? = nil
     var _number: [SignalServiceProtos_DataMessage.Contact.Phone] = []
     var _email: [SignalServiceProtos_DataMessage.Contact.Email] = []
     var _address: [SignalServiceProtos_DataMessage.Contact.PostalAddress] = []
-    var _avatar: SignalServiceProtos_DataMessage.Contact.Avatar?
-    var _organization: String?
+    var _avatar: SignalServiceProtos_DataMessage.Contact.Avatar? = nil
+    var _organization: String? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -2928,7 +2932,7 @@ extension SignalServiceProtos_DataMessage.Contact.Name: SwiftProtobuf.Message, S
     3: .same(proto: "prefix"),
     4: .same(proto: "suffix"),
     5: .same(proto: "middleName"),
-    6: .same(proto: "displayName")
+    6: .same(proto: "displayName"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -2984,7 +2988,7 @@ extension SignalServiceProtos_DataMessage.Contact.Phone: SwiftProtobuf.Message,
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "value"),
     2: .same(proto: "type"),
-    3: .same(proto: "label")
+    3: .same(proto: "label"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3025,7 +3029,7 @@ extension SignalServiceProtos_DataMessage.Contact.Phone.TypeEnum: SwiftProtobuf.
     1: .same(proto: "HOME"),
     2: .same(proto: "MOBILE"),
     3: .same(proto: "WORK"),
-    4: .same(proto: "CUSTOM")
+    4: .same(proto: "CUSTOM"),
   ]
 }
 
@@ -3034,7 +3038,7 @@ extension SignalServiceProtos_DataMessage.Contact.Email: SwiftProtobuf.Message,
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "value"),
     2: .same(proto: "type"),
-    3: .same(proto: "label")
+    3: .same(proto: "label"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3075,7 +3079,7 @@ extension SignalServiceProtos_DataMessage.Contact.Email.TypeEnum: SwiftProtobuf.
     1: .same(proto: "HOME"),
     2: .same(proto: "MOBILE"),
     3: .same(proto: "WORK"),
-    4: .same(proto: "CUSTOM")
+    4: .same(proto: "CUSTOM"),
   ]
 }
 
@@ -3090,7 +3094,7 @@ extension SignalServiceProtos_DataMessage.Contact.PostalAddress: SwiftProtobuf.M
     6: .same(proto: "city"),
     7: .same(proto: "region"),
     8: .same(proto: "postcode"),
-    9: .same(proto: "country")
+    9: .same(proto: "country"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3160,7 +3164,7 @@ extension SignalServiceProtos_DataMessage.Contact.PostalAddress.TypeEnum: SwiftP
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "HOME"),
     2: .same(proto: "WORK"),
-    3: .same(proto: "CUSTOM")
+    3: .same(proto: "CUSTOM"),
   ]
 }
 
@@ -3168,12 +3172,12 @@ extension SignalServiceProtos_DataMessage.Contact.Avatar: SwiftProtobuf.Message,
   static let protoMessageName: String = SignalServiceProtos_DataMessage.Contact.protoMessageName + ".Avatar"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "avatar"),
-    2: .same(proto: "isProfile")
+    2: .same(proto: "isProfile"),
   ]
 
   fileprivate class _StorageClass {
-    var _avatar: SignalServiceProtos_AttachmentPointer?
-    var _isProfile: Bool?
+    var _avatar: SignalServiceProtos_AttachmentPointer? = nil
+    var _isProfile: Bool? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -3236,7 +3240,7 @@ extension SignalServiceProtos_DataMessage.Contact.Avatar: SwiftProtobuf.Message,
 extension SignalServiceProtos_NullMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".NullMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "padding")
+    1: .same(proto: "padding"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3266,7 +3270,7 @@ extension SignalServiceProtos_ReceiptMessage: SwiftProtobuf.Message, SwiftProtob
   static let protoMessageName: String = _protobuf_package + ".ReceiptMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "type"),
-    2: .same(proto: "timestamp")
+    2: .same(proto: "timestamp"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3300,7 +3304,7 @@ extension SignalServiceProtos_ReceiptMessage: SwiftProtobuf.Message, SwiftProtob
 extension SignalServiceProtos_ReceiptMessage.TypeEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "DELIVERY"),
-    1: .same(proto: "READ")
+    1: .same(proto: "READ"),
   ]
 }
 
@@ -3310,7 +3314,7 @@ extension SignalServiceProtos_Verified: SwiftProtobuf.Message, SwiftProtobuf._Me
     1: .same(proto: "destination"),
     2: .same(proto: "identityKey"),
     3: .same(proto: "state"),
-    4: .same(proto: "nullMessage")
+    4: .same(proto: "nullMessage"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3355,7 +3359,7 @@ extension SignalServiceProtos_Verified.State: SwiftProtobuf._ProtoNameProviding
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "DEFAULT"),
     1: .same(proto: "VERIFIED"),
-    2: .same(proto: "UNVERIFIED")
+    2: .same(proto: "UNVERIFIED"),
   ]
 }
 
@@ -3370,19 +3374,19 @@ extension SignalServiceProtos_SyncMessage: SwiftProtobuf.Message, SwiftProtobuf.
     6: .same(proto: "blocked"),
     7: .same(proto: "verified"),
     9: .same(proto: "configuration"),
-    8: .same(proto: "padding")
+    8: .same(proto: "padding"),
   ]
 
   fileprivate class _StorageClass {
-    var _sent: SignalServiceProtos_SyncMessage.Sent?
-    var _contacts: SignalServiceProtos_SyncMessage.Contacts?
-    var _groups: SignalServiceProtos_SyncMessage.Groups?
-    var _request: SignalServiceProtos_SyncMessage.Request?
+    var _sent: SignalServiceProtos_SyncMessage.Sent? = nil
+    var _contacts: SignalServiceProtos_SyncMessage.Contacts? = nil
+    var _groups: SignalServiceProtos_SyncMessage.Groups? = nil
+    var _request: SignalServiceProtos_SyncMessage.Request? = nil
     var _read: [SignalServiceProtos_SyncMessage.Read] = []
-    var _blocked: SignalServiceProtos_SyncMessage.Blocked?
-    var _verified: SignalServiceProtos_Verified?
-    var _configuration: SignalServiceProtos_SyncMessage.Configuration?
-    var _padding: Data?
+    var _blocked: SignalServiceProtos_SyncMessage.Blocked? = nil
+    var _verified: SignalServiceProtos_Verified? = nil
+    var _configuration: SignalServiceProtos_SyncMessage.Configuration? = nil
+    var _padding: Data? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -3490,14 +3494,14 @@ extension SignalServiceProtos_SyncMessage.Sent: SwiftProtobuf.Message, SwiftProt
     1: .same(proto: "destination"),
     2: .same(proto: "timestamp"),
     3: .same(proto: "message"),
-    4: .same(proto: "expirationStartTimestamp")
+    4: .same(proto: "expirationStartTimestamp"),
   ]
 
   fileprivate class _StorageClass {
-    var _destination: String?
-    var _timestamp: UInt64?
-    var _message: SignalServiceProtos_DataMessage?
-    var _expirationStartTimestamp: UInt64?
+    var _destination: String? = nil
+    var _timestamp: UInt64? = nil
+    var _message: SignalServiceProtos_DataMessage? = nil
+    var _expirationStartTimestamp: UInt64? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -3573,12 +3577,12 @@ extension SignalServiceProtos_SyncMessage.Contacts: SwiftProtobuf.Message, Swift
   static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".Contacts"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "blob"),
-    2: .same(proto: "isComplete")
+    2: .same(proto: "isComplete"),
   ]
 
   fileprivate class _StorageClass {
-    var _blob: SignalServiceProtos_AttachmentPointer?
-    var _isComplete: Bool?
+    var _blob: SignalServiceProtos_AttachmentPointer? = nil
+    var _isComplete: Bool? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -3641,11 +3645,11 @@ extension SignalServiceProtos_SyncMessage.Contacts: SwiftProtobuf.Message, Swift
 extension SignalServiceProtos_SyncMessage.Groups: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".Groups"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "blob")
+    1: .same(proto: "blob"),
   ]
 
   fileprivate class _StorageClass {
-    var _blob: SignalServiceProtos_AttachmentPointer?
+    var _blob: SignalServiceProtos_AttachmentPointer? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -3703,7 +3707,7 @@ extension SignalServiceProtos_SyncMessage.Blocked: SwiftProtobuf.Message, SwiftP
   static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".Blocked"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "numbers"),
-    2: .same(proto: "groupIds")
+    2: .same(proto: "groupIds"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3737,7 +3741,7 @@ extension SignalServiceProtos_SyncMessage.Blocked: SwiftProtobuf.Message, SwiftP
 extension SignalServiceProtos_SyncMessage.Request: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".Request"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "type")
+    1: .same(proto: "type"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3769,7 +3773,7 @@ extension SignalServiceProtos_SyncMessage.Request.TypeEnum: SwiftProtobuf._Proto
     1: .same(proto: "CONTACTS"),
     2: .same(proto: "GROUPS"),
     3: .same(proto: "BLOCKED"),
-    4: .same(proto: "CONFIGURATION")
+    4: .same(proto: "CONFIGURATION"),
   ]
 }
 
@@ -3777,7 +3781,7 @@ extension SignalServiceProtos_SyncMessage.Read: SwiftProtobuf.Message, SwiftProt
   static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".Read"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "sender"),
-    2: .same(proto: "timestamp")
+    2: .same(proto: "timestamp"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3811,7 +3815,7 @@ extension SignalServiceProtos_SyncMessage.Read: SwiftProtobuf.Message, SwiftProt
 extension SignalServiceProtos_SyncMessage.Configuration: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SignalServiceProtos_SyncMessage.protoMessageName + ".Configuration"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "readReceipts")
+    1: .same(proto: "readReceipts"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3849,7 +3853,7 @@ extension SignalServiceProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftPro
     7: .same(proto: "fileName"),
     8: .same(proto: "flags"),
     9: .same(proto: "width"),
-    10: .same(proto: "height")
+    10: .same(proto: "height"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -3922,7 +3926,7 @@ extension SignalServiceProtos_AttachmentPointer: SwiftProtobuf.Message, SwiftPro
 
 extension SignalServiceProtos_AttachmentPointer.Flags: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "VOICE_MESSAGE")
+    1: .same(proto: "VOICE_MESSAGE"),
   ]
 }
 
@@ -3933,15 +3937,15 @@ extension SignalServiceProtos_GroupContext: SwiftProtobuf.Message, SwiftProtobuf
     2: .same(proto: "type"),
     3: .same(proto: "name"),
     4: .same(proto: "members"),
-    5: .same(proto: "avatar")
+    5: .same(proto: "avatar"),
   ]
 
   fileprivate class _StorageClass {
-    var _id: Data?
-    var _type: SignalServiceProtos_GroupContext.TypeEnum?
-    var _name: String?
+    var _id: Data? = nil
+    var _type: SignalServiceProtos_GroupContext.TypeEnum? = nil
+    var _name: String? = nil
     var _members: [String] = []
-    var _avatar: SignalServiceProtos_AttachmentPointer?
+    var _avatar: SignalServiceProtos_AttachmentPointer? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -4025,7 +4029,7 @@ extension SignalServiceProtos_GroupContext.TypeEnum: SwiftProtobuf._ProtoNamePro
     1: .same(proto: "UPDATE"),
     2: .same(proto: "DELIVER"),
     3: .same(proto: "QUIT"),
-    4: .same(proto: "REQUEST_INFO")
+    4: .same(proto: "REQUEST_INFO"),
   ]
 }
 
@@ -4039,18 +4043,18 @@ extension SignalServiceProtos_ContactDetails: SwiftProtobuf.Message, SwiftProtob
     5: .same(proto: "verified"),
     6: .same(proto: "profileKey"),
     7: .same(proto: "blocked"),
-    8: .same(proto: "expireTimer")
+    8: .same(proto: "expireTimer"),
   ]
 
   fileprivate class _StorageClass {
-    var _number: String?
-    var _name: String?
-    var _avatar: SignalServiceProtos_ContactDetails.Avatar?
-    var _color: String?
-    var _verified: SignalServiceProtos_Verified?
-    var _profileKey: Data?
-    var _blocked: Bool?
-    var _expireTimer: UInt32?
+    var _number: String? = nil
+    var _name: String? = nil
+    var _avatar: SignalServiceProtos_ContactDetails.Avatar? = nil
+    var _color: String? = nil
+    var _verified: SignalServiceProtos_Verified? = nil
+    var _profileKey: Data? = nil
+    var _blocked: Bool? = nil
+    var _expireTimer: UInt32? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -4150,7 +4154,7 @@ extension SignalServiceProtos_ContactDetails.Avatar: SwiftProtobuf.Message, Swif
   static let protoMessageName: String = SignalServiceProtos_ContactDetails.protoMessageName + ".Avatar"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "contentType"),
-    2: .same(proto: "length")
+    2: .same(proto: "length"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -4191,18 +4195,18 @@ extension SignalServiceProtos_GroupDetails: SwiftProtobuf.Message, SwiftProtobuf
     5: .same(proto: "active"),
     6: .same(proto: "expireTimer"),
     7: .same(proto: "color"),
-    8: .same(proto: "blocked")
+    8: .same(proto: "blocked"),
   ]
 
   fileprivate class _StorageClass {
-    var _id: Data?
-    var _name: String?
+    var _id: Data? = nil
+    var _name: String? = nil
     var _members: [String] = []
-    var _avatar: SignalServiceProtos_GroupDetails.Avatar?
-    var _active: Bool?
-    var _expireTimer: UInt32?
-    var _color: String?
-    var _blocked: Bool?
+    var _avatar: SignalServiceProtos_GroupDetails.Avatar? = nil
+    var _active: Bool? = nil
+    var _expireTimer: UInt32? = nil
+    var _color: String? = nil
+    var _blocked: Bool? = nil
 
     static let defaultInstance = _StorageClass()
 
@@ -4302,7 +4306,7 @@ extension SignalServiceProtos_GroupDetails.Avatar: SwiftProtobuf.Message, SwiftP
   static let protoMessageName: String = SignalServiceProtos_GroupDetails.protoMessageName + ".Avatar"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "contentType"),
-    2: .same(proto: "length")
+    2: .same(proto: "length"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
diff --git a/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift b/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift
index d93698ee8..c886ccc95 100644
--- a/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift
+++ b/SignalServiceKit/src/Protos/Generated/WebSocketProto.swift
@@ -148,7 +148,7 @@ public enum WebSocketProtoError: Error {
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -309,7 +309,7 @@ extension WebSocketProtoWebSocketRequestMessage.WebSocketProtoWebSocketRequestMe
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }
@@ -443,12 +443,12 @@ extension WebSocketProtoWebSocketResponseMessage.WebSocketProtoWebSocketResponse
         }
         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)
         }
@@ -464,7 +464,7 @@ extension WebSocketProtoWebSocketResponseMessage.WebSocketProtoWebSocketResponse
         return result
     }
 
-    @objc public override var description: String {
+    @objc public override var debugDescription: String {
         return "\(proto)"
     }
 }