From c11b82ba305de0a736216ad262baea6855ec791a Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Fri, 20 Oct 2017 16:21:52 -0400
Subject: [PATCH] Respond to CR.

// FREEBIE
---
 Signal/src/network/GiphyAPI.swift        | 15 +++++++++------
 Signal/src/network/GiphyDownloader.swift | 15 +++------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Signal/src/network/GiphyAPI.swift b/Signal/src/network/GiphyAPI.swift
index c8958c91a..09f295a3f 100644
--- a/Signal/src/network/GiphyAPI.swift
+++ b/Signal/src/network/GiphyAPI.swift
@@ -279,11 +279,7 @@ extension GiphyError: LocalizedError {
 
     private let kGiphyBaseURL = "https://api.giphy.com/"
 
-    private func giphyAPISessionManager() -> AFHTTPSessionManager? {
-        guard let baseUrl = NSURL(string:kGiphyBaseURL) else {
-            Logger.error("\(TAG) Invalid base URL.")
-            return nil
-        }
+    public class func giphySessionConfiguration() -> URLSessionConfiguration {
         let configuration = URLSessionConfiguration.ephemeral
         let proxyHost = "giphy-proxy-production.whispersystems.org"
         let proxyPort = 80
@@ -295,9 +291,16 @@ extension GiphyError: LocalizedError {
             "HTTPSProxy": proxyHost,
             "HTTPSPort": proxyPort
         ]
+        return configuration
+    }
 
+    private func giphyAPISessionManager() -> AFHTTPSessionManager? {
+        guard let baseUrl = NSURL(string:kGiphyBaseURL) else {
+            Logger.error("\(TAG) Invalid base URL.")
+            return nil
+        }
         let sessionManager = AFHTTPSessionManager(baseURL:baseUrl as URL,
-                                                  sessionConfiguration:configuration)
+                                                  sessionConfiguration:GiphyAPI.giphySessionConfiguration())
         sessionManager.requestSerializer = AFJSONRequestSerializer()
         sessionManager.responseSerializer = AFJSONResponseSerializer()
 
diff --git a/Signal/src/network/GiphyDownloader.swift b/Signal/src/network/GiphyDownloader.swift
index 356856f9e..2a624eb07 100644
--- a/Signal/src/network/GiphyDownloader.swift
+++ b/Signal/src/network/GiphyDownloader.swift
@@ -181,20 +181,11 @@ extension URLSessionTask {
     private let kGiphyBaseURL = "https://api.giphy.com/"
 
     private func giphyDownloadSession() -> URLSession? {
-        let configuration = URLSessionConfiguration.ephemeral
-        let proxyHost = "giphy-proxy-production.whispersystems.org"
-        let proxyPort = 80
-        configuration.connectionProxyDictionary = [
-            "HTTPEnable": 1,
-            "HTTPProxy": proxyHost,
-            "HTTPPort": proxyPort,
-            "HTTPSEnable": 1,
-            "HTTPSProxy": proxyHost,
-            "HTTPSPort": proxyPort
-        ]
+        let configuration = GiphyAPI.giphySessionConfiguration()
         configuration.urlCache = nil
         configuration.requestCachePolicy = .reloadIgnoringCacheData
-        let session = URLSession(configuration:configuration, delegate:self, delegateQueue:operationQueue)
+        let session = URLSession(configuration:configuration,
+                                 delegate:self, delegateQueue:operationQueue)
         return session
     }