From 374bcbc9970d90f0dec3a8e2ae1e6cc4b571ba4f Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 20 Sep 2019 10:23:25 +1000 Subject: [PATCH] Re-order files --- .../src/Loki/API/{ => Group Chat}/LokiGroupChat.swift | 0 .../src/Loki/API/{ => Group Chat}/LokiGroupChatAPI.swift | 0 .../src/Loki/API/{ => Group Chat}/LokiGroupMessage.swift | 0 .../src/Loki/API/{ => Group Chat}/LokiRSSFeed.swift | 0 SignalServiceKit/src/Loki/API/LokiP2PAPI.swift | 2 ++ .../{LokiAPI+MultiDeviceAPI.swift => LokiStorageAPI.swift} | 7 ++++++- .../API/{ => Multi Device}/LokiDeviceLinkingSession.swift | 0 .../LokiDeviceLinkingSessionDelegate.swift | 0 .../Multi Device}/LokiPairingAuthorisation.swift | 0 .../Multi Device}/OWSPrimaryStorage+Multidevice.swift | 0 .../Multi Device}/PairingAuthorisationsIndex.swift | 0 .../src/Loki/{Crypto => Database}/OWSPrimaryStorage+Loki.h | 0 .../src/Loki/{Crypto => Database}/OWSPrimaryStorage+Loki.m | 0 13 files changed, 8 insertions(+), 1 deletion(-) rename SignalServiceKit/src/Loki/API/{ => Group Chat}/LokiGroupChat.swift (100%) rename SignalServiceKit/src/Loki/API/{ => Group Chat}/LokiGroupChatAPI.swift (100%) rename SignalServiceKit/src/Loki/API/{ => Group Chat}/LokiGroupMessage.swift (100%) rename SignalServiceKit/src/Loki/API/{ => Group Chat}/LokiRSSFeed.swift (100%) rename SignalServiceKit/src/Loki/API/{LokiAPI+MultiDeviceAPI.swift => LokiStorageAPI.swift} (81%) rename SignalServiceKit/src/Loki/API/{ => Multi Device}/LokiDeviceLinkingSession.swift (100%) rename SignalServiceKit/src/Loki/API/{ => Multi Device}/LokiDeviceLinkingSessionDelegate.swift (100%) rename SignalServiceKit/src/Loki/{Multidevice => API/Multi Device}/LokiPairingAuthorisation.swift (100%) rename SignalServiceKit/src/Loki/{Multidevice => API/Multi Device}/OWSPrimaryStorage+Multidevice.swift (100%) rename SignalServiceKit/src/Loki/{Multidevice => API/Multi Device}/PairingAuthorisationsIndex.swift (100%) rename SignalServiceKit/src/Loki/{Crypto => Database}/OWSPrimaryStorage+Loki.h (100%) rename SignalServiceKit/src/Loki/{Crypto => Database}/OWSPrimaryStorage+Loki.m (100%) diff --git a/SignalServiceKit/src/Loki/API/LokiGroupChat.swift b/SignalServiceKit/src/Loki/API/Group Chat/LokiGroupChat.swift similarity index 100% rename from SignalServiceKit/src/Loki/API/LokiGroupChat.swift rename to SignalServiceKit/src/Loki/API/Group Chat/LokiGroupChat.swift diff --git a/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift b/SignalServiceKit/src/Loki/API/Group Chat/LokiGroupChatAPI.swift similarity index 100% rename from SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift rename to SignalServiceKit/src/Loki/API/Group Chat/LokiGroupChatAPI.swift diff --git a/SignalServiceKit/src/Loki/API/LokiGroupMessage.swift b/SignalServiceKit/src/Loki/API/Group Chat/LokiGroupMessage.swift similarity index 100% rename from SignalServiceKit/src/Loki/API/LokiGroupMessage.swift rename to SignalServiceKit/src/Loki/API/Group Chat/LokiGroupMessage.swift diff --git a/SignalServiceKit/src/Loki/API/LokiRSSFeed.swift b/SignalServiceKit/src/Loki/API/Group Chat/LokiRSSFeed.swift similarity index 100% rename from SignalServiceKit/src/Loki/API/LokiRSSFeed.swift rename to SignalServiceKit/src/Loki/API/Group Chat/LokiRSSFeed.swift diff --git a/SignalServiceKit/src/Loki/API/LokiP2PAPI.swift b/SignalServiceKit/src/Loki/API/LokiP2PAPI.swift index 94ddc9332..b58d58795 100644 --- a/SignalServiceKit/src/Loki/API/LokiP2PAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiP2PAPI.swift @@ -1,4 +1,6 @@ +// TODO: Match Android design + @objc(LKP2PAPI) public class LokiP2PAPI : NSObject { private static let storage = OWSPrimaryStorage.shared() diff --git a/SignalServiceKit/src/Loki/API/LokiAPI+MultiDeviceAPI.swift b/SignalServiceKit/src/Loki/API/LokiStorageAPI.swift similarity index 81% rename from SignalServiceKit/src/Loki/API/LokiAPI+MultiDeviceAPI.swift rename to SignalServiceKit/src/Loki/API/LokiStorageAPI.swift index 4027c3cc6..494d2b752 100644 --- a/SignalServiceKit/src/Loki/API/LokiAPI+MultiDeviceAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiStorageAPI.swift @@ -1,7 +1,12 @@ import PromiseKit -public extension LokiAPI { +@objc(LKStorageAPI) +public final class LokiStorageAPI : NSObject { + // MARK: Lifecycle + override private init() { } + + // MARK: Public API public static func addSlaveAccount(with hexEncodedPublicKey: String) -> Promise { // Adds the given slave account to the user's device mapping on the server notImplemented() diff --git a/SignalServiceKit/src/Loki/API/LokiDeviceLinkingSession.swift b/SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSession.swift similarity index 100% rename from SignalServiceKit/src/Loki/API/LokiDeviceLinkingSession.swift rename to SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSession.swift diff --git a/SignalServiceKit/src/Loki/API/LokiDeviceLinkingSessionDelegate.swift b/SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSessionDelegate.swift similarity index 100% rename from SignalServiceKit/src/Loki/API/LokiDeviceLinkingSessionDelegate.swift rename to SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSessionDelegate.swift diff --git a/SignalServiceKit/src/Loki/Multidevice/LokiPairingAuthorisation.swift b/SignalServiceKit/src/Loki/API/Multi Device/LokiPairingAuthorisation.swift similarity index 100% rename from SignalServiceKit/src/Loki/Multidevice/LokiPairingAuthorisation.swift rename to SignalServiceKit/src/Loki/API/Multi Device/LokiPairingAuthorisation.swift diff --git a/SignalServiceKit/src/Loki/Multidevice/OWSPrimaryStorage+Multidevice.swift b/SignalServiceKit/src/Loki/API/Multi Device/OWSPrimaryStorage+Multidevice.swift similarity index 100% rename from SignalServiceKit/src/Loki/Multidevice/OWSPrimaryStorage+Multidevice.swift rename to SignalServiceKit/src/Loki/API/Multi Device/OWSPrimaryStorage+Multidevice.swift diff --git a/SignalServiceKit/src/Loki/Multidevice/PairingAuthorisationsIndex.swift b/SignalServiceKit/src/Loki/API/Multi Device/PairingAuthorisationsIndex.swift similarity index 100% rename from SignalServiceKit/src/Loki/Multidevice/PairingAuthorisationsIndex.swift rename to SignalServiceKit/src/Loki/API/Multi Device/PairingAuthorisationsIndex.swift diff --git a/SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.h b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.h similarity index 100% rename from SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.h rename to SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.h diff --git a/SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.m b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m similarity index 100% rename from SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.m rename to SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m