oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean

This commit is contained in:
Niels Andriesse 2021-01-14 09:51:09 +11:00
parent 8cdc63a9a9
commit 672026b8bf
6 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Session.xcodeproj/project.pbxproj
View File

@ -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 = "<group>"; };
C3A7229B2558E4310043A11F /* OpenGroupMessage+Conversion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OpenGroupMessage+Conversion.swift"; sourceTree = "<group>"; };
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 = "<group>"; };
C3AAFFC125AE916D0089E6DD /* OpenGroupManagerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGroupManagerProtocol.swift; sourceTree = "<group>"; };
C3AAFFCB25AE92150089E6DD /* OpenGroupManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGroupManager.swift; sourceTree = "<group>"; };
C3AAFFDE25AE96FF0089E6DD /* ConfigurationMessage+Convenience.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ConfigurationMessage+Convenience.swift"; sourceTree = "<group>"; };
C3AAFFF125AE99710089E6DD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@ -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 */,

8
SessionMessagingKit/Configuration.swift
View File

@ -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)
}
}

2
SessionMessagingKit/Open Groups/OpenGroupManager.swift
View File

@ -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

6
SessionMessagingKit/OpenGroupManagerProtocol.swift
View File

@ -1,6 +0,0 @@
import PromiseKit
public protocol OpenGroupManagerProtocol {
func add(with url: String, using transaction: Any) -> Promise<Void>
}

2
SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
View File

@ -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()
}
}

2
SignalUtilitiesKit/Configuration.swift
View File

@ -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))
}