From e2219f986c0e15688a3f1cb3fb0cee723eded795 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <>
Date: Tue, 21 Jul 2020 15:49:49 +1000
Subject: [PATCH] rename & clean & open group onion request init

---
 SignalServiceKit/src/Loki/API/FileServerAPI.swift           | 6 +++---
 .../src/Loki/API/Onion Requests/OnionRequestAPI.swift       | 2 +-
 .../src/Loki/API/Open Groups/LokiPublicChatAPI.swift        | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/SignalServiceKit/src/Loki/API/FileServerAPI.swift b/SignalServiceKit/src/Loki/API/FileServerAPI.swift
index a0772c3bc..c45f341c3 100644
--- a/SignalServiceKit/src/Loki/API/FileServerAPI.swift
+++ b/SignalServiceKit/src/Loki/API/FileServerAPI.swift
@@ -90,7 +90,7 @@ public final class FileServerAPI : DotNetAPI {
             let url = URL(string: "\(server)/users?\(queryParameters)")!
             let request = TSRequest(url: url)
             if (useOnionRequests) {
-                return OnionRequestAPI.sendOnionRequestFileServerDest(request, server: server, using: fileServerPublicKey).map2 { rawResponse -> Set<DeviceLink> in
+                return OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: fileServerPublicKey).map2 { rawResponse -> Set<DeviceLink> in
                     guard let data = rawResponse["data"] as? [JSON] else {
                         print("[Loki] Couldn't parse device links for users: \(hexEncodedPublicKeys) from: \(rawResponse).")
                         throw DotNetAPIError.parsingFailed
@@ -127,7 +127,7 @@ public final class FileServerAPI : DotNetAPI {
             request.allHTTPHeaderFields = [ "Content-Type" : "application/json", "Authorization" : "Bearer \(token)" ]
             return attempt(maxRetryCount: 8, recoveringOn: SnodeAPI.workQueue) {
                 if (useOnionRequests) {
-                    return OnionRequestAPI.sendOnionRequestFileServerDest(request, server: server, using: fileServerPublicKey).map2 { _ in }
+                    return OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: fileServerPublicKey).map2 { _ in }
                 }
                 return LokiFileServerProxy(for: server).perform(request).map2 { _ in }
             }.handlingInvalidAuthTokenIfNeeded(for: server).recover2 { error in
@@ -182,7 +182,7 @@ public final class FileServerAPI : DotNetAPI {
             return Promise(error: error)
         }
         if (useOnionRequests) {
-            return OnionRequestAPI.sendOnionRequestFileServerDest(request, server: server, using: fileServerPublicKey).map2 { json in
+            return OnionRequestAPI.sendOnionRequestLsrpcDest(request, server: server, using: fileServerPublicKey).map2 { json in
                 guard let data = json["data"] as? JSON, let downloadURL = data["url"] as? String else {
                     print("[Loki] Couldn't parse profile picture from: \(json).")
                     throw DotNetAPIError.parsingFailed
diff --git a/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift b/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift
index 7c15554f4..440090857 100644
--- a/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift	
+++ b/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift	
@@ -241,7 +241,7 @@ public enum OnionRequestAPI {
     }
     
     /// Sends an onion request to `file server`. Builds new paths as needed.
-    internal static func sendOnionRequestFileServerDest(_ request: NSURLRequest, server: String, using x25519Key: String) -> Promise<JSON> {
+    internal static func sendOnionRequestLsrpcDest(_ request: NSURLRequest, server: String, using x25519Key: String) -> Promise<JSON> {
         var headers = getCanonicalHeaders(for: request)
         let urlAsString = request.url!.absoluteString
         let serverURLEndIndex = urlAsString.range(of: server)!.upperBound
diff --git a/SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift b/SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift
index 76dccb902..11e4e8a59 100644
--- a/SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift	
+++ b/SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift	
@@ -8,6 +8,8 @@ public final class LokiPublicChatAPI : DotNetAPI {
 
     public static var displayNameUpdatees: [String:Set<String>] = [:]
     
+    internal static var useOnionRequests = true
+    
     // MARK: Settings
     private static let attachmentType = "net.app.core.oembed"
     private static let channelInfoType = "net.patter-app.settings"