Messenger - restore from backup

XXMessengerClient

• Add MessengerRestoreBackup function wrapper
  • Restore CMix and UserDiscovery from backup
  • Return restored params and contacts
• Add MessengerIsListeningForMessages function

xx-messenger example

• Restore backup from file
• Refactor app startup

Examples/xx-messenger/Sources/HomeFeature/HomeFeature.swift

@@ -14,8 +14,6 @@ import XXModels
 public struct HomeState: Equatable {
   public init(
     failure: String? = nil,
-    authFailure: String? = nil,
-    messageListenerFailure: String? = nil,
     isNetworkHealthy: Bool? = nil,
     networkNodesReport: NodeRegistrationReport? = nil,
     isDeletingAccount: Bool = false,
@@ -25,8 +23,6 @@ public struct HomeState: Equatable {
     userSearch: UserSearchState? = nil
   ) {
     self.failure = failure
-    self.authFailure = authFailure
-    self.messageListenerFailure = messageListenerFailure
     self.isNetworkHealthy = isNetworkHealthy
     self.isDeletingAccount = isDeletingAccount
     self.alert = alert
@@ -36,8 +32,6 @@ public struct HomeState: Equatable {
   }
 
   public var failure: String?
-  public var authFailure: String?
-  public var messageListenerFailure: String?
   public var isNetworkHealthy: Bool?
   public var networkNodesReport: NodeRegistrationReport?
   public var isDeletingAccount: Bool
@@ -55,20 +49,6 @@ public enum HomeAction: Equatable {
     case failure(NSError)
   }
 
-  public enum AuthHandler: Equatable {
-    case start
-    case stop
-    case failure(NSError)
-    case failureDismissed
-  }
-
-  public enum MessageListener: Equatable {
-    case start
-    case stop
-    case failure(NSError)
-    case failureDismissed
-  }
-
   public enum NetworkMonitor: Equatable {
     case start
     case stop
@@ -84,8 +64,6 @@ public enum HomeAction: Equatable {
   }
 
   case messenger(Messenger)
-  case authHandler(AuthHandler)
-  case messageListener(MessageListener)
   case networkMonitor(NetworkMonitor)
   case deleteAccount(DeleteAccount)
   case didDismissAlert
@@ -103,8 +81,6 @@ public struct HomeEnvironment {
   public init(
     messenger: Messenger,
     dbManager: DBManager,
-    authHandler: AuthCallbackHandler,
-    messageListener: MessageListenerHandler,
     mainQueue: AnySchedulerOf<DispatchQueue>,
     bgQueue: AnySchedulerOf<DispatchQueue>,
     register: @escaping () -> RegisterEnvironment,
@@ -113,8 +89,6 @@ public struct HomeEnvironment {
   ) {
     self.messenger = messenger
     self.dbManager = dbManager
-    self.authHandler = authHandler
-    self.messageListener = messageListener
     self.mainQueue = mainQueue
     self.bgQueue = bgQueue
     self.register = register
@@ -124,8 +98,6 @@ public struct HomeEnvironment {
 
   public var messenger: Messenger
   public var dbManager: DBManager
-  public var authHandler: AuthCallbackHandler
-  public var messageListener: MessageListenerHandler
   public var mainQueue: AnySchedulerOf<DispatchQueue>
   public var bgQueue: AnySchedulerOf<DispatchQueue>
   public var register: () -> RegisterEnvironment
@@ -137,8 +109,6 @@ extension HomeEnvironment {
   public static let unimplemented = HomeEnvironment(
     messenger: .unimplemented,
     dbManager: .unimplemented,
-    authHandler: .unimplemented,
-    messageListener: .unimplemented,
     mainQueue: .unimplemented,
     bgQueue: .unimplemented,
     register: { .unimplemented },
@@ -151,14 +121,10 @@ public let homeReducer = Reducer<HomeState, HomeAction, HomeEnvironment>
 { state, action, env in
   enum NetworkHealthEffectId {}
   enum NetworkNodesEffectId {}
-  enum AuthCallbacksEffectId {}
-  enum MessageListenerEffectId {}
 
   switch action {
   case .messenger(.start):
     return .merge(
-      Effect(value: .authHandler(.start)),
-      Effect(value: .messageListener(.start)),
       Effect(value: .networkMonitor(.stop)),
       Effect.result {
         do {
@@ -166,6 +132,9 @@ public let homeReducer = Reducer<HomeState, HomeAction, HomeEnvironment>
 
           if env.messenger.isConnected() == false {
             try env.messenger.connect()
+          }
+
+          if env.messenger.isListeningForMessages() == false {
             try env.messenger.listenForMessages()
           }
 
@@ -197,52 +166,6 @@ public let homeReducer = Reducer<HomeState, HomeAction, HomeEnvironment>
     state.failure = error.localizedDescription
     return .none
 
-  case .authHandler(.start):
-    return Effect.run { subscriber in
-      let cancellable = env.authHandler(onError: { error in
-        subscriber.send(.authHandler(.failure(error as NSError)))
-      })
-      return AnyCancellable { cancellable.cancel() }
-    }
-    .subscribe(on: env.bgQueue)
-    .receive(on: env.mainQueue)
-    .eraseToEffect()
-    .cancellable(id: AuthCallbacksEffectId.self, cancelInFlight: true)
-
-  case .authHandler(.stop):
-    return .cancel(id: AuthCallbacksEffectId.self)
-
-  case .authHandler(.failure(let error)):
-    state.authFailure = error.localizedDescription
-    return .none
-
-  case .authHandler(.failureDismissed):
-    state.authFailure = nil
-    return .none
-
-  case .messageListener(.start):
-    return Effect.run { subscriber in
-      let cancellable = env.messageListener(onError: { error in
-        subscriber.send(.messageListener(.failure(error as NSError)))
-      })
-      return AnyCancellable { cancellable.cancel() }
-    }
-    .subscribe(on: env.bgQueue)
-    .receive(on: env.mainQueue)
-    .eraseToEffect()
-    .cancellable(id: MessageListenerEffectId.self, cancelInFlight: true)
-
-  case .messageListener(.stop):
-    return .cancel(id: MessageListenerEffectId.self)
-
-  case .messageListener(.failure(let error)):
-    state.messageListenerFailure = error.localizedDescription
-    return .none
-
-  case .messageListener(.failureDismissed):
-    state.messageListenerFailure = nil
-    return .none
-
   case .networkMonitor(.start):
     return .merge(
       Effect.run { subscriber in