Fix proxying of Giphy requests.

// FREEBIE

Signal/src/network/GiphyAPI.swift

@@ -284,17 +284,20 @@ extension GiphyError: LocalizedError {
             Logger.error("\(TAG) Invalid base URL.")
             return nil
         }
-        // TODO: We need to verify that this session configuration properly
+        let configuration = URLSessionConfiguration.ephemeral
-        //       proxies all requests.
+        let proxyHost = "giphy-proxy-production.whispersystems.org"
-        let sessionConf = URLSessionConfiguration.ephemeral
+        let proxyPort = 80
-        sessionConf.connectionProxyDictionary = [
+        configuration.connectionProxyDictionary = [
-            kCFProxyHostNameKey as String: "giphy-proxy-production.whispersystems.org",
+            "HTTPEnable": 1,
-            kCFProxyPortNumberKey as String: "80",
+            "HTTPProxy": proxyHost,
-            kCFProxyTypeKey as String: kCFProxyTypeHTTPS
+            "HTTPPort": proxyPort,
+            "HTTPSEnable": 1,
+            "HTTPSProxy": proxyHost,
+            "HTTPSPort": proxyPort
         ]
 
         let sessionManager = AFHTTPSessionManager(baseURL:baseUrl as URL,
-                                                  sessionConfiguration:sessionConf)
+                                                  sessionConfiguration:configuration)
         sessionManager.requestSerializer = AFJSONRequestSerializer()
         sessionManager.responseSerializer = AFJSONResponseSerializer()
 

Signal/src/network/GiphyDownloader.swift

@@ -181,13 +181,16 @@ extension URLSessionTask {
     private let kGiphyBaseURL = "https://api.giphy.com/"
 
     private func giphyDownloadSession() -> URLSession? {
-        // TODO: We need to verify that this session configuration properly
-        //       proxies all requests.
         let configuration = URLSessionConfiguration.ephemeral
+        let proxyHost = "giphy-proxy-production.whispersystems.org"
+        let proxyPort = 80
         configuration.connectionProxyDictionary = [
-            kCFProxyHostNameKey as String: "giphy-proxy-production.whispersystems.org",
+            "HTTPEnable": 1,
-            kCFProxyPortNumberKey as String: "80",
+            "HTTPProxy": proxyHost,
-            kCFProxyTypeKey as String: kCFProxyTypeHTTPS
+            "HTTPPort": proxyPort,
+            "HTTPSEnable": 1,
+            "HTTPSProxy": proxyHost,
+            "HTTPSPort": proxyPort
         ]
         configuration.urlCache = nil
         configuration.requestCachePolicy = .reloadIgnoringCacheData