From 672026b8bf5651ce392275df4e20ad2eb9b42954 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 14 Jan 2021 09:51:09 +1100 Subject: [PATCH] Clean --- Session.xcodeproj/project.pbxproj | 4 ---- SessionMessagingKit/Configuration.swift | 8 +++----- SessionMessagingKit/Open Groups/OpenGroupManager.swift | 2 +- SessionMessagingKit/OpenGroupManagerProtocol.swift | 6 ------ .../Sending & Receiving/MessageReceiver+Handling.swift | 2 +- SignalUtilitiesKit/Configuration.swift | 2 +- 6 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 SessionMessagingKit/OpenGroupManagerProtocol.swift diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index d41e19fdf..148832f84 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -717,7 +717,6 @@ C3A7225E2558C38D0043A11F /* Promise+Retaining.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3A7225D2558C38D0043A11F /* Promise+Retaining.swift */; }; C3A7229C2558E4310043A11F /* OpenGroupMessage+Conversion.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3A7229B2558E4310043A11F /* OpenGroupMessage+Conversion.swift */; }; C3AABDDF2553ECF00042FF4C /* Array+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C2A5D12553860800C340D1 /* Array+Description.swift */; }; - C3AAFFC225AE916D0089E6DD /* OpenGroupManagerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3AAFFC125AE916D0089E6DD /* OpenGroupManagerProtocol.swift */; }; C3AAFFE825AE975D0089E6DD /* ConfigurationMessage+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3AAFFDE25AE96FF0089E6DD /* ConfigurationMessage+Convenience.swift */; }; C3AAFFF225AE99710089E6DD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3AAFFF125AE99710089E6DD /* AppDelegate.swift */; }; C3BBE0762554CDA60050F1E3 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3BBE0752554CDA60050F1E3 /* Configuration.swift */; }; @@ -1739,7 +1738,6 @@ C3A7225D2558C38D0043A11F /* Promise+Retaining.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Promise+Retaining.swift"; sourceTree = ""; }; C3A7229B2558E4310043A11F /* OpenGroupMessage+Conversion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OpenGroupMessage+Conversion.swift"; sourceTree = ""; }; C3AA6BB824CE8F1B002358B6 /* Migrating Translations from Android.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = "Migrating Translations from Android.md"; path = "Meta/Translations/Migrating Translations from Android.md"; sourceTree = ""; }; - C3AAFFC125AE916D0089E6DD /* OpenGroupManagerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGroupManagerProtocol.swift; sourceTree = ""; }; C3AAFFCB25AE92150089E6DD /* OpenGroupManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGroupManager.swift; sourceTree = ""; }; C3AAFFDE25AE96FF0089E6DD /* ConfigurationMessage+Convenience.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ConfigurationMessage+Convenience.swift"; sourceTree = ""; }; C3AAFFF125AE99710089E6DD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -3334,7 +3332,6 @@ C32C5BB9256DC7C4003C73A2 /* To Do */, C3BBE0752554CDA60050F1E3 /* Configuration.swift */, C3BBE07F2554CDD70050F1E3 /* Storage.swift */, - C3AAFFC125AE916D0089E6DD /* OpenGroupManagerProtocol.swift */, B8B3201F258B1A540020074B /* Contacts */, C32C5BCB256DC818003C73A2 /* Database */, C300A5BB2554AFFB00555489 /* Messages */, @@ -4851,7 +4848,6 @@ buildActionMask = 2147483647; files = ( C3A7229C2558E4310043A11F /* OpenGroupMessage+Conversion.swift in Sources */, - C3AAFFC225AE916D0089E6DD /* OpenGroupManagerProtocol.swift in Sources */, C32C5DBE256DD743003C73A2 /* OpenGroupPoller.swift in Sources */, B8856D08256F10F1001CE70E /* DeviceSleepManager.swift in Sources */, C3471F4C25553AB000297E91 /* MessageReceiver+Decryption.swift in Sources */, diff --git a/SessionMessagingKit/Configuration.swift b/SessionMessagingKit/Configuration.swift index 7751744b7..dc4a80ec6 100644 --- a/SessionMessagingKit/Configuration.swift +++ b/SessionMessagingKit/Configuration.swift @@ -3,19 +3,17 @@ import SessionProtocolKit @objc public final class SNMessagingKitConfiguration : NSObject { public let storage: SessionMessagingKitStorageProtocol - public let openGroupManager: OpenGroupManagerProtocol @objc public static var shared: SNMessagingKitConfiguration! - fileprivate init(storage: SessionMessagingKitStorageProtocol, openGroupManager: OpenGroupManagerProtocol) { + fileprivate init(storage: SessionMessagingKitStorageProtocol) { self.storage = storage - self.openGroupManager = openGroupManager } } public enum SNMessagingKit { // Just to make the external API nice - public static func configure(storage: SessionMessagingKitStorageProtocol, openGroupManager: OpenGroupManagerProtocol) { - SNMessagingKitConfiguration.shared = SNMessagingKitConfiguration(storage: storage, openGroupManager: openGroupManager) + public static func configure(storage: SessionMessagingKitStorageProtocol) { + SNMessagingKitConfiguration.shared = SNMessagingKitConfiguration(storage: storage) } } diff --git a/SessionMessagingKit/Open Groups/OpenGroupManager.swift b/SessionMessagingKit/Open Groups/OpenGroupManager.swift index aa9b9e593..a4420d3e5 100644 --- a/SessionMessagingKit/Open Groups/OpenGroupManager.swift +++ b/SessionMessagingKit/Open Groups/OpenGroupManager.swift @@ -1,7 +1,7 @@ import PromiseKit @objc(SNOpenGroupManager) -public final class OpenGroupManager : NSObject, OpenGroupManagerProtocol { +public final class OpenGroupManager : NSObject { private var pollers: [String:OpenGroupPoller] = [:] private var isPolling = false diff --git a/SessionMessagingKit/OpenGroupManagerProtocol.swift b/SessionMessagingKit/OpenGroupManagerProtocol.swift deleted file mode 100644 index 2a640ae35..000000000 --- a/SessionMessagingKit/OpenGroupManagerProtocol.swift +++ /dev/null @@ -1,6 +0,0 @@ -import PromiseKit - -public protocol OpenGroupManagerProtocol { - - func add(with url: String, using transaction: Any) -> Promise -} diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift index 9db13b83a..d137c5afe 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift @@ -148,7 +148,7 @@ extension MessageReceiver { let allOpenGroups = Set(storage.getAllUserOpenGroups().keys) for openGroupURL in message.openGroups { guard !allOpenGroups.contains(openGroupURL) else { continue } - SNMessagingKitConfiguration.shared.openGroupManager.add(with: openGroupURL, using: transaction).retainUntilComplete() + OpenGroupManager.shared.add(with: openGroupURL, using: transaction).retainUntilComplete() } } diff --git a/SignalUtilitiesKit/Configuration.swift b/SignalUtilitiesKit/Configuration.swift index a28d601ff..b69c8dddd 100644 --- a/SignalUtilitiesKit/Configuration.swift +++ b/SignalUtilitiesKit/Configuration.swift @@ -7,7 +7,7 @@ extension OWSPrimaryStorage : OWSPrimaryStorageProtocol { } public final class Configuration : NSObject { @objc public static func performMainSetup() { - SNMessagingKit.configure(storage: Storage.shared, openGroupManager: OpenGroupManager.shared) + SNMessagingKit.configure(storage: Storage.shared) SNSnodeKit.configure(storage: Storage.shared) SNUtilitiesKit.configure(owsPrimaryStorage: OWSPrimaryStorage.shared(), maxFileSize: UInt(Double(FileServerAPI.maxFileSize) / FileServerAPI.fileSizeORMultiplier)) }