From 08a1ec77a11fbe3eab66e17a0e901da58a0dc4a3 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Wed, 1 May 2019 15:47:58 +1000 Subject: [PATCH] =?UTF-8?q?Rename=20ServiceNode=20=E2=86=92=20LokiMessagin?= =?UTF-8?q?gAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LokiKit/{ServiceNode.swift => LokiMessagingAPI.swift} | 2 +- Signal.xcodeproj/project.pbxproj | 8 ++++---- .../Registration/OnboardingKeyPairViewController.swift | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename LokiKit/{ServiceNode.swift => LokiMessagingAPI.swift} (98%) diff --git a/LokiKit/ServiceNode.swift b/LokiKit/LokiMessagingAPI.swift similarity index 98% rename from LokiKit/ServiceNode.swift rename to LokiKit/LokiMessagingAPI.swift index 302167228..a0731f33c 100644 --- a/LokiKit/ServiceNode.swift +++ b/LokiKit/LokiMessagingAPI.swift @@ -1,6 +1,6 @@ import PromiseKit -public struct ServiceNode { +public struct LokiMessagingAPI { private static var snodeURL: String { return textSecureServerURL } private static var port: String { return "8080" } diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index c2495d6ab..ae30a2082 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -559,7 +559,7 @@ B821F2FA2272CEEE002C88C0 /* OnboardingKeyPairViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B821F2F92272CEEE002C88C0 /* OnboardingKeyPairViewController.swift */; }; B8DC3D7722795E2400D909D6 /* ECKeyPair.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7422795E2300D909D6 /* ECKeyPair.swift */; }; B8DC3D7822795E2400D909D6 /* ECKeyPair.m in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7522795E2300D909D6 /* ECKeyPair.m */; }; - B8DC3D7922795E2400D909D6 /* ServiceNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7622795E2400D909D6 /* ServiceNode.swift */; }; + B8DC3D7922795E2400D909D6 /* LokiMessagingAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7622795E2400D909D6 /* LokiMessagingAPI.swift */; }; B8DC3D8022795E4000D909D6 /* portuguese.txt in Resources */ = {isa = PBXBuildFile; fileRef = B8DC3D7B22795E4000D909D6 /* portuguese.txt */; }; B8DC3D8122795E4000D909D6 /* spanish.txt in Resources */ = {isa = PBXBuildFile; fileRef = B8DC3D7C22795E4000D909D6 /* spanish.txt */; }; B8DC3D8222795E4000D909D6 /* Mnemonic.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7D22795E4000D909D6 /* Mnemonic.swift */; }; @@ -1352,7 +1352,7 @@ B8DC3D7322795E2300D909D6 /* ECKeyPair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ECKeyPair.h; sourceTree = ""; }; B8DC3D7422795E2300D909D6 /* ECKeyPair.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ECKeyPair.swift; sourceTree = ""; }; B8DC3D7522795E2300D909D6 /* ECKeyPair.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ECKeyPair.m; sourceTree = ""; }; - B8DC3D7622795E2400D909D6 /* ServiceNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceNode.swift; sourceTree = ""; }; + B8DC3D7622795E2400D909D6 /* LokiMessagingAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LokiMessagingAPI.swift; sourceTree = ""; }; B8DC3D7B22795E4000D909D6 /* portuguese.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = portuguese.txt; sourceTree = ""; }; B8DC3D7C22795E4000D909D6 /* spanish.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = spanish.txt; sourceTree = ""; }; B8DC3D7D22795E4000D909D6 /* Mnemonic.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mnemonic.swift; sourceTree = ""; }; @@ -2617,7 +2617,7 @@ B8DC3D7322795E2300D909D6 /* ECKeyPair.h */, B8DC3D7522795E2300D909D6 /* ECKeyPair.m */, B8DC3D7422795E2300D909D6 /* ECKeyPair.swift */, - B8DC3D7622795E2400D909D6 /* ServiceNode.swift */, + B8DC3D7622795E2400D909D6 /* LokiMessagingAPI.swift */, ); path = LokiKit; sourceTree = ""; @@ -3805,7 +3805,7 @@ 340FC8BD204DAC8D007AEB0F /* ShowGroupMembersViewController.m in Sources */, 3496956F21A301A100DCFE74 /* OWSBackupLazyRestore.swift in Sources */, 459311FC1D75C948008DD4F0 /* OWSDeviceTableViewCell.m in Sources */, - B8DC3D7922795E2400D909D6 /* ServiceNode.swift in Sources */, + B8DC3D7922795E2400D909D6 /* LokiMessagingAPI.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Signal/src/ViewControllers/Registration/OnboardingKeyPairViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingKeyPairViewController.swift index c4c6b4b0f..f89ee16ed 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingKeyPairViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingKeyPairViewController.swift @@ -94,11 +94,11 @@ final class OnboardingKeyPairViewController : OnboardingBaseViewController { updateKeyPair() // Test // ================ - let _ = ServiceNode.retrieveAllMessages().done { result in + let _ = LokiMessagingAPI.retrieveAllMessages().done { result in print(result.task.originalRequest!) print(result.task.response!) } - let _ = ServiceNode.sendTestMessage().done { result in + let _ = LokiMessagingAPI.sendTestMessage().done { result in print(result.task.originalRequest!) print(result.task.response!) }