From 45b93cc4b4968873b7e795794596867617edb59f Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 14 Jan 2019 16:44:18 -0500
Subject: [PATCH] Respond to CR.

---
 Pods                                                 |  2 +-
 .../ViewControllers/ColorPickerViewController.swift  |  2 +-
 .../DeviceSyncing/OWSIncomingSentMessageTranscript.m |  3 ++-
 .../src/Messages/Interactions/OWSLinkPreview.swift   | 12 ++++--------
 SignalServiceKit/src/Messages/OWSMessageManager.m    |  6 ++++--
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Pods b/Pods
index b46f53105..ea60f60ea 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit b46f53105951613fedd8117b83931f43f6ab12f1
+Subproject commit ea60f60ea01bc51fc2434248890b494e37da98a5
diff --git a/Signal/src/ViewControllers/ColorPickerViewController.swift b/Signal/src/ViewControllers/ColorPickerViewController.swift
index c67991bd6..b0513e804 100644
--- a/Signal/src/ViewControllers/ColorPickerViewController.swift
+++ b/Signal/src/ViewControllers/ColorPickerViewController.swift
@@ -483,7 +483,7 @@ private class MockOutgoingMessage: TSOutgoingMessage {
                    groupMetaMessage: .unspecified,
                    quotedMessage: nil,
                    contactShare: nil,
-            linkPreview: nil)
+                   linkPreview: nil)
     }
 
     required init?(coder: NSCoder) {
diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m
index 24a4713bb..b70dada69 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSIncomingSentMessageTranscript.m
@@ -45,7 +45,8 @@ NS_ASSUME_NONNULL_BEGIN
 
     _quotedMessage = [TSQuotedMessage quotedMessageForDataMessage:_dataMessage thread:_thread transaction:transaction];
     _contact = [OWSContacts contactForDataMessage:_dataMessage transaction:transaction];
-    _linkPreview = [[OWSLinkPreview alloc] initWithDataMessage:_dataMessage body:_body transaction:transaction];
+    _linkPreview =
+        [OWSLinkPreview buildValidatedLinkPreviewWithDataMessage:_dataMessage body:_body transaction:transaction];
 
     if (sentProto.unidentifiedStatus.count > 0) {
         NSMutableArray<NSString *> *nonUdRecipientIds = [NSMutableArray new];
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
index 822ad8225..f5f0634be 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
+++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
@@ -35,9 +35,9 @@ public class OWSLinkPreview: MTLModel {
     }
 
     @objc
-    public required init?(dataMessage: SSKProtoDataMessage,
-                          body: String?,
-                          transaction: YapDatabaseReadWriteTransaction) {
+    public class func buildValidatedLinkPreview(dataMessage: SSKProtoDataMessage,
+                                                body: String?,
+                                                transaction: YapDatabaseReadWriteTransaction) -> OWSLinkPreview? {
         guard let previewProto = dataMessage.preview else {
             return nil
         }
@@ -82,11 +82,7 @@ public class OWSLinkPreview: MTLModel {
             return nil
         }
 
-        self.urlString = urlString
-        self.title = title
-        self.attachmentId = imageAttachmentId
-
-        super.init()
+        return OWSLinkPreview(urlString: urlString, title: title, attachmentId: imageAttachmentId)
     }
 
     @objc
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index 1c10e7080..9ad97da24 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -1288,7 +1288,9 @@ NS_ASSUME_NONNULL_BEGIN
                                                                                             transaction:transaction];
 
                 OWSLinkPreview *_Nullable linkPreview =
-                    [[OWSLinkPreview alloc] initWithDataMessage:dataMessage body:body transaction:transaction];
+                    [OWSLinkPreview buildValidatedLinkPreviewWithDataMessage:dataMessage
+                                                                        body:body
+                                                                 transaction:transaction];
 
                 OWSLogDebug(@"incoming message from: %@ for group: %@ with timestamp: %lu",
                     envelopeAddress(envelope),
@@ -1354,7 +1356,7 @@ NS_ASSUME_NONNULL_BEGIN
                                                                                     transaction:transaction];
 
         OWSLinkPreview *_Nullable linkPreview =
-            [[OWSLinkPreview alloc] initWithDataMessage:dataMessage body:body transaction:transaction];
+            [OWSLinkPreview buildValidatedLinkPreviewWithDataMessage:dataMessage body:body transaction:transaction];
 
         // Legit usage of senderTimestamp when creating incoming message from received envelope
         TSIncomingMessage *incomingMessage =