From 8e44bf554c3e409466dc6e571f714f522b586563 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 17 Jan 2019 13:18:44 -0500
Subject: [PATCH] Respond to CR.

---
 Signal/src/network/GiphyAPI.swift                         | 2 +-
 Signal/src/network/GiphyDownloader.swift                  | 2 +-
 SignalMessaging/utils/ThreadUtil.m                        | 1 -
 .../src/Messages/Interactions/OWSLinkPreview.swift        | 8 +++-----
 .../Network/{ReverseProxy.swift => ContentProxy.swift}    | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)
 rename SignalServiceKit/src/Network/{ReverseProxy.swift => ContentProxy.swift} (97%)

diff --git a/Signal/src/network/GiphyAPI.swift b/Signal/src/network/GiphyAPI.swift
index 25121883c..181222191 100644
--- a/Signal/src/network/GiphyAPI.swift
+++ b/Signal/src/network/GiphyAPI.swift
@@ -281,7 +281,7 @@ extension GiphyError: LocalizedError {
     private let kGiphyBaseURL = "https://api.giphy.com/"
 
     private func giphyAPISessionManager() -> AFHTTPSessionManager? {
-        return ReverseProxy.jsonSessionManager(baseUrl: kGiphyBaseURL)
+        return ContentProxy.jsonSessionManager(baseUrl: kGiphyBaseURL)
     }
 
     // MARK: Search
diff --git a/Signal/src/network/GiphyDownloader.swift b/Signal/src/network/GiphyDownloader.swift
index 86c94ae91..71c329957 100644
--- a/Signal/src/network/GiphyDownloader.swift
+++ b/Signal/src/network/GiphyDownloader.swift
@@ -415,7 +415,7 @@ extension URLSessionTask {
     private lazy var giphyDownloadSession: URLSession = {
         AssertIsOnMainThread()
 
-        let configuration = ReverseProxy.sessionConfiguration()
+        let configuration = ContentProxy.sessionConfiguration()
         configuration.urlCache = nil
         configuration.requestCachePolicy = .reloadIgnoringCacheData
         configuration.httpMaximumConnectionsPerHost = 10
diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m
index 28352351c..0eb027186 100644
--- a/SignalMessaging/utils/ThreadUtil.m
+++ b/SignalMessaging/utils/ThreadUtil.m
@@ -8,7 +8,6 @@
 #import "OWSQuotedReplyModel.h"
 #import "OWSUnreadIndicator.h"
 #import "TSUnreadIndicatorInteraction.h"
-#import <PromiseKit/AnyPromise.h>
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalMessaging/OWSProfileManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
index 73106cc20..6c9fd5189 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
+++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
@@ -23,7 +23,6 @@ public class OWSLinkPreviewInfo: NSObject {
     @objc
     public var imageFilePath: String?
 
-    @objc
     public init(urlString: String, title: String?, imageFilePath: String? = nil) {
         self.urlString = urlString
         self.title = title
@@ -152,7 +151,7 @@ public class OWSLinkPreview: MTLModel {
         guard OWSLinkPreview.featureEnabled else {
             throw LinkPreviewError.noPreview
         }
-        let imageAttachmentId = OWSLinkPreview.saveAttachmentIfPossible(forFilePath: info.imageFilePath,
+        let imageAttachmentId = OWSLinkPreview.saveAttachmentIfPossible(inputFilePath: info.imageFilePath,
                                                                         transaction: transaction)
 
         let linkPreview = OWSLinkPreview(urlString: info.urlString, title: info.title, imageAttachmentId: imageAttachmentId)
@@ -165,7 +164,7 @@ public class OWSLinkPreview: MTLModel {
         return linkPreview
     }
 
-    private class func saveAttachmentIfPossible(forFilePath filePath: String?,
+    private class func saveAttachmentIfPossible(inputFilePath filePath: String?,
                                                 transaction: YapDatabaseReadWriteTransaction) -> String? {
         guard let filePath = filePath else {
             return nil
@@ -223,8 +222,7 @@ public class OWSLinkPreview: MTLModel {
         "reddit.com",
         "imgur.com",
         "instagram.com",
-        "giphy.com",
-        "instagram.com"
+        "giphy.com"
     ]
 
     // TODO: Finalize
diff --git a/SignalServiceKit/src/Network/ReverseProxy.swift b/SignalServiceKit/src/Network/ContentProxy.swift
similarity index 97%
rename from SignalServiceKit/src/Network/ReverseProxy.swift
rename to SignalServiceKit/src/Network/ContentProxy.swift
index 275c614d7..098a9e557 100644
--- a/SignalServiceKit/src/Network/ReverseProxy.swift
+++ b/SignalServiceKit/src/Network/ContentProxy.swift
@@ -5,7 +5,7 @@
 import Foundation
 
 @objc
-public class ReverseProxy: NSObject {
+public class ContentProxy: NSObject {
 
     @available(*, unavailable, message:"do not instantiate this class.")
     private override init() {