fix issues

runslikebutter · Jan 25, 2022 · ff82731 · ff82731
1 parent f054e82
commit ff82731
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git a/ButterflyMX Demo/AppDelegate.swift b/ButterflyMX Demo/AppDelegate.swift
@@ -104,12 +104,9 @@ extension AppDelegate {
 
  func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
  CallsService.shared.pushNotificationToken = deviceToken
-
- if BMXCoreKit.shared.isUserLoggedIn && CallNotificationTypeManager.shared.getCurrentCallNotificationType() == .pushNotification{
- let token = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
- UserDefaults.standard.set(token, forKey: "apnsDeviceToken")
- UserDefaults.standard.synchronize()
- }
+ let token = deviceToken.map { String(format: "%02.2hhx", $0) }.joined()
+ UserDefaults.standard.set(token, forKey: "apnsDeviceToken")
+ UserDefaults.standard.synchronize()
  }
 
  func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {

diff --git a/ButterflyMX Demo/Controllers/LoginViewController.swift b/ButterflyMX Demo/Controllers/LoginViewController.swift
@@ -46,13 +46,7 @@ class LoginViewController: UITableViewController {
  let mainViewController = stb.instantiateViewController(withIdentifier: "MainTabController")
  mainViewController.modalPresentationStyle = .overFullScreen
  SVProgressHUD.dismiss()
- self.present(mainViewController, animated: true, completion: {
- guard let pushToken = CallsService.shared.getPushToken() else { return } 
- let token = pushToken.map { String(format: "%02.2hhx", $0) }.joined()
-
- UserDefaults.standard.set(token, forKey: "deviceToken")
- UserDefaults.standard.synchronize()
- })
+ self.present(mainViewController, animated: true, completion: nil)
  case .failure(let error):
  print(error)
  SVProgressHUD.showError(withStatus: error.localizedDescription)

diff --git a/ButterflyMX Demo/Logic/CallStatusHandler.swift b/ButterflyMX Demo/Logic/CallStatusHandler.swift
@@ -39,6 +39,6 @@ class CallStatusHandler: BMXCall.CallStatusDelegate {
  }
 
  private func dismissIncomingCall() {
- CallsService.shared.window?.rootViewController?.dismiss(animated: true)
+ incomingCallViewController?.dismiss(animated: true)
  }
 }
diff --git a/ButterflyMX Demo/Logic/CallsService.swift b/ButterflyMX Demo/Logic/CallsService.swift
@@ -140,12 +140,10 @@ extension CallsService: PKPushRegistryDelegate, CXProviderDelegate {
 
  func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
  pushkitToken = pushCredentials.token
- if BMXCoreKit.shared.isUserLoggedIn {
- let token = pushCredentials.token.map { String(format: "%02.2hhx", $0) }.joined()
-
- UserDefaults.standard.set(token, forKey: "deviceToken")
- UserDefaults.standard.synchronize()
- }
+
+ let token = pushCredentials.token.map { String(format: "%02.2hhx", $0) }.joined()
+ UserDefaults.standard.set(token, forKey: "deviceToken")
+ UserDefaults.standard.synchronize()
  }
 
  private func reportFailedCall(reason: CXCallEndedReason) {