Skip to content
Snippets Groups Projects
Commit d7929432 authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Refactor

parent 2edf739a
No related branches found
No related tags found
2 merge requests!123Messenger receive file,!102Release 1.0.0
This commit is part of merge request !102. Comments created here will be created in the context of that merge request.
...@@ -12,7 +12,7 @@ public struct MessengerRegisterReceiveFileCallback { ...@@ -12,7 +12,7 @@ public struct MessengerRegisterReceiveFileCallback {
extension MessengerRegisterReceiveFileCallback { extension MessengerRegisterReceiveFileCallback {
public static func live(_ env: MessengerEnvironment) -> MessengerRegisterReceiveFileCallback { public static func live(_ env: MessengerEnvironment) -> MessengerRegisterReceiveFileCallback {
MessengerRegisterReceiveFileCallback { callback in MessengerRegisterReceiveFileCallback { callback in
env.receiveFileCallbacksRegistry.register(callback) env.receiveFileCallbacks.register(callback)
} }
} }
} }
......
...@@ -25,7 +25,7 @@ extension MessengerStartFileTransfer { ...@@ -25,7 +25,7 @@ extension MessengerStartFileTransfer {
e2eFileTransferParamsJSON: env.getE2EFileTransferParams(), e2eFileTransferParamsJSON: env.getE2EFileTransferParams(),
fileTransferParamsJSON: env.getFileTransferParams() fileTransferParamsJSON: env.getFileTransferParams()
), ),
callback: env.receiveFileCallbacksRegistry.registered() callback: env.receiveFileCallbacks.registered()
) )
env.fileTransfer.set(fileTransfer) env.fileTransfer.set(fileTransfer)
} }
......
...@@ -33,7 +33,7 @@ public struct MessengerEnvironment { ...@@ -33,7 +33,7 @@ public struct MessengerEnvironment {
public var newOrLoadUd: NewOrLoadUd public var newOrLoadUd: NewOrLoadUd
public var newUdManagerFromBackup: NewUdManagerFromBackup public var newUdManagerFromBackup: NewUdManagerFromBackup
public var passwordStorage: PasswordStorage public var passwordStorage: PasswordStorage
public var receiveFileCallbacksRegistry: ReceiveFileCallbacksRegistry public var receiveFileCallbacks: ReceiveFileCallbacksRegistry
public var registerForNotifications: RegisterForNotifications public var registerForNotifications: RegisterForNotifications
public var registerLogWriter: RegisterLogWriter public var registerLogWriter: RegisterLogWriter
public var resumeBackup: ResumeBackup public var resumeBackup: ResumeBackup
...@@ -84,7 +84,7 @@ extension MessengerEnvironment { ...@@ -84,7 +84,7 @@ extension MessengerEnvironment {
newOrLoadUd: .live, newOrLoadUd: .live,
newUdManagerFromBackup: .live, newUdManagerFromBackup: .live,
passwordStorage: .keychain, passwordStorage: .keychain,
receiveFileCallbacksRegistry: .live(), receiveFileCallbacks: .live(),
registerForNotifications: .live, registerForNotifications: .live,
registerLogWriter: .live, registerLogWriter: .live,
resumeBackup: .live, resumeBackup: .live,
...@@ -130,7 +130,7 @@ extension MessengerEnvironment { ...@@ -130,7 +130,7 @@ extension MessengerEnvironment {
newOrLoadUd: .unimplemented, newOrLoadUd: .unimplemented,
newUdManagerFromBackup: .unimplemented, newUdManagerFromBackup: .unimplemented,
passwordStorage: .unimplemented, passwordStorage: .unimplemented,
receiveFileCallbacksRegistry: .unimplemented, receiveFileCallbacks: .unimplemented,
registerForNotifications: .unimplemented, registerForNotifications: .unimplemented,
registerLogWriter: .unimplemented, registerLogWriter: .unimplemented,
resumeBackup: .unimplemented, resumeBackup: .unimplemented,
......
...@@ -10,7 +10,7 @@ final class MessengerRegisterReceiveFileCallbackTests: XCTestCase { ...@@ -10,7 +10,7 @@ final class MessengerRegisterReceiveFileCallbackTests: XCTestCase {
var didCancelRegisteredCallback = 0 var didCancelRegisteredCallback = 0
var env: MessengerEnvironment = .unimplemented var env: MessengerEnvironment = .unimplemented
env.receiveFileCallbacksRegistry.register = { callback in env.receiveFileCallbacks.register = { callback in
registeredCallbacks.append(callback) registeredCallbacks.append(callback)
return Cancellable { didCancelRegisteredCallback += 1 } return Cancellable { didCancelRegisteredCallback += 1 }
} }
......
...@@ -34,7 +34,7 @@ final class MessengerStartFileTransferTests: XCTestCase { ...@@ -34,7 +34,7 @@ final class MessengerStartFileTransferTests: XCTestCase {
env.fileTransfer.set = { env.fileTransfer.set = {
didSetFileTransfer.append($0) didSetFileTransfer.append($0)
} }
env.receiveFileCallbacksRegistry.registered = { env.receiveFileCallbacks.registered = {
ReceiveFileCallback { result in ReceiveFileCallback { result in
didReceiveFile.append(result) didReceiveFile.append(result)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment