Swift completion handler changed to show default notifications from a…

…nother plugins.
Otomatto · Dec 8, 2021 · 001599c · 001599c
1 parent af21bab
commit 001599c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/ios/Classes/lib/SwiftAwesomeNotificationsPlugin.swift b/ios/Classes/lib/SwiftAwesomeNotificationsPlugin.swift
@@ -44,14 +44,17 @@ public class SwiftAwesomeNotificationsPlugin: NSObject, FlutterPlugin, UNUserNot
  jsonData: jsonData,
  buttonKeyPressed: response.actionIdentifier,
  userText: userText,
- completionHandler: completionHandler
+ withCompletionHandler: completionHandler
  )
  } else {
  print("Received an invalid notification content")
- }
-
- if _originalNotificationCenterDelegate?.userNotificationCenter?(center, didReceive: response, withCompletionHandler: completionHandler) == nil {
- completionHandler()
+
+ if _originalNotificationCenterDelegate != nil {
+ _originalNotificationCenterDelegate?.userNotificationCenter?(center, didReceive: response, withCompletionHandler: completionHandler)
+ }
+ else {
+ completionHandler()
+ }
  }
  }
 
@@ -60,7 +63,10 @@ public class SwiftAwesomeNotificationsPlugin: NSObject, FlutterPlugin, UNUserNot
  if !receiveNotification(content: notification.request.content, withCompletionHandler: completionHandler) {
  // completionHandler was *not* called, so maybe this notification is for another plugin:
 
- if _originalNotificationCenterDelegate?.userNotificationCenter?(center, willPresent: notification, withCompletionHandler: completionHandler) == nil {
+ if _originalNotificationCenterDelegate != nil {
+ _originalNotificationCenterDelegate?.userNotificationCenter?(center, willPresent: notification, withCompletionHandler: completionHandler)
+ }
+ else {
  completionHandler([.alert, .badge, .sound])
  }
  }
@@ -319,7 +325,7 @@ public class SwiftAwesomeNotificationsPlugin: NSObject, FlutterPlugin, UNUserNot
  }
 
 #if !ACTION_EXTENSION
- private func receiveAction(jsonData: String?, buttonKeyPressed:String?, userText:String?, withCompletionHandler: completionHandler){
+ private func receiveAction(jsonData: String?, buttonKeyPressed:String?, userText:String?, withCompletionHandler completionHandler: @escaping () -> Void){
 
  if(SwiftAwesomeNotificationsPlugin.appLifeCycle == .AppKilled){
  fireBackgroundLostEvents()