From ec7c6066cc5f54bb8459dd85c24c3da9f36140d8 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Mon, 25 Nov 2019 10:43:04 +1100
Subject: [PATCH] Fix linking with desktop

---
 SignalServiceKit/protobuf/SignalService.proto |  1 -
 .../DeviceSyncing/OWSSyncContactsMessage.m    |  6 +++--
 .../src/Protos/Generated/SSKProto.swift       | 25 ++++++++-----------
 .../Protos/Generated/SignalService.pb.swift   |  1 -
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/SignalServiceKit/protobuf/SignalService.proto b/SignalServiceKit/protobuf/SignalService.proto
index 6284aa354..adc0a212b 100644
--- a/SignalServiceKit/protobuf/SignalService.proto
+++ b/SignalServiceKit/protobuf/SignalService.proto
@@ -309,7 +309,6 @@ message SyncMessage {
   }
 
   message Contacts {
-    // @required
     optional AttachmentPointer blob       = 1;
     // Signal-iOS renamed this property.
     optional bool              isComplete = 2 [default = false];
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
index e188d20ff..e1a69f985 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
@@ -76,7 +76,8 @@ NS_ASSUME_NONNULL_BEGIN
     if (self.attachmentIds.count == 0) {
         SSKProtoAttachmentPointerBuilder *attachmentProtoBuilder = [SSKProtoAttachmentPointer builderWithId:0];
         SSKProtoAttachmentPointer *attachmentProto = [attachmentProtoBuilder buildAndReturnError:&error];
-        contactsBuilder = [SSKProtoSyncMessageContacts builderWithBlob:attachmentProto];
+        contactsBuilder = [SSKProtoSyncMessageContacts builder];
+        [contactsBuilder setBlob:attachmentProto];
         __block NSData *data;
         [OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
             data = [self buildPlainTextAttachmentDataWithTransaction:transaction];
@@ -88,7 +89,8 @@ NS_ASSUME_NONNULL_BEGIN
             OWSFailDebug(@"Couldn't build protobuf.");
             return nil;
         }
-        contactsBuilder = [SSKProtoSyncMessageContacts builderWithBlob:attachmentProto];
+        contactsBuilder = [SSKProtoSyncMessageContacts builder];
+        [contactsBuilder setBlob:attachmentProto];
     }
     [contactsBuilder setIsComplete:YES];
     
diff --git a/SignalServiceKit/src/Protos/Generated/SSKProto.swift b/SignalServiceKit/src/Protos/Generated/SSKProto.swift
index 4086fe892..3270835f5 100644
--- a/SignalServiceKit/src/Protos/Generated/SSKProto.swift
+++ b/SignalServiceKit/src/Protos/Generated/SSKProto.swift
@@ -4410,13 +4410,16 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder {
 
     // MARK: - SSKProtoSyncMessageContactsBuilder
 
-    @objc public class func builder(blob: SSKProtoAttachmentPointer) -> SSKProtoSyncMessageContactsBuilder {
-        return SSKProtoSyncMessageContactsBuilder(blob: blob)
+    @objc public class func builder() -> SSKProtoSyncMessageContactsBuilder {
+        return SSKProtoSyncMessageContactsBuilder()
     }
 
     // asBuilder() constructs a builder that reflects the proto's contents.
     @objc public func asBuilder() -> SSKProtoSyncMessageContactsBuilder {
-        let builder = SSKProtoSyncMessageContactsBuilder(blob: blob)
+        let builder = SSKProtoSyncMessageContactsBuilder()
+        if let _value = blob {
+            builder.setBlob(_value)
+        }
         if hasIsComplete {
             builder.setIsComplete(isComplete)
         }
@@ -4432,12 +4435,6 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder {
 
         @objc fileprivate override init() {}
 
-        @objc fileprivate init(blob: SSKProtoAttachmentPointer) {
-            super.init()
-
-            setBlob(blob)
-        }
-
         @objc public func setBlob(_ valueParam: SSKProtoAttachmentPointer) {
             proto.blob = valueParam.proto
         }
@@ -4461,7 +4458,7 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder {
 
     fileprivate let proto: SignalServiceProtos_SyncMessage.Contacts
 
-    @objc public let blob: SSKProtoAttachmentPointer
+    @objc public let blob: SSKProtoAttachmentPointer?
 
     @objc public var isComplete: Bool {
         return proto.isComplete
@@ -4481,7 +4478,7 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder {
     }
 
     private init(proto: SignalServiceProtos_SyncMessage.Contacts,
-                 blob: SSKProtoAttachmentPointer) {
+                 blob: SSKProtoAttachmentPointer?) {
         self.proto = proto
         self.blob = blob
     }
@@ -4497,10 +4494,10 @@ extension SSKProtoSyncMessageSent.SSKProtoSyncMessageSentBuilder {
     }
 
     fileprivate class func parseProto(_ proto: SignalServiceProtos_SyncMessage.Contacts) throws -> SSKProtoSyncMessageContacts {
-        guard proto.hasBlob else {
-            throw SSKProtoError.invalidProtobuf(description: "\(logTag) missing required field: blob")
+        var blob: SSKProtoAttachmentPointer? = nil
+        if proto.hasBlob {
+            blob = try SSKProtoAttachmentPointer.parseProto(proto.blob)
         }
-        let blob = try SSKProtoAttachmentPointer.parseProto(proto.blob)
 
         // MARK: - Begin Validation Logic for SSKProtoSyncMessageContacts -
 
diff --git a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift
index 324b8d38f..5532d9b2a 100644
--- a/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift
+++ b/SignalServiceKit/src/Protos/Generated/SignalService.pb.swift
@@ -1890,7 +1890,6 @@ struct SignalServiceProtos_SyncMessage {
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    /// @required
     var blob: SignalServiceProtos_AttachmentPointer {
       get {return _storage._blob ?? SignalServiceProtos_AttachmentPointer()}
       set {_uniqueStorage()._blob = newValue}