Merge pull request #9 from Eurofunk/add-notification-settings-getter

Add notification settings getter
Eurofunk · Oct 4, 2024 · 6fd738b · 6fd738b
2 parents 8fb1100 + 848b47c
commit 6fd738b
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 25 deletions.
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -156,14 +156,14 @@ packages:
       path: "../flutter_apns"
       relative: true
     source: path
-    version: "1.7.3"
+    version: "1.7.5"
   flutter_apns_only:
     dependency: transitive
     description:
       path: "../flutter_apns_only"
       relative: true
     source: path
-    version: "1.7.3"
+    version: "1.7.5"
   flutter_local_notifications:
     dependency: "direct main"
     description:

diff --git a/flutter_apns/pubspec.lock b/flutter_apns/pubspec.lock
@@ -116,7 +116,7 @@ packages:
       path: "../flutter_apns_only"
       relative: true
     source: path
-    version: "1.7.3"
+    version: "1.7.5"
   flutter_test:
     dependency: "direct dev"
     description: flutter

diff --git a/flutter_apns/pubspec.yaml b/flutter_apns/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_apns
 description: APNS push notification plugin. Uses firebase_messaging on Android, but replaces it on iOS with custom implementation.
-version: 1.7.3
+version: 1.7.5
 homepage: https://github.com/mwaylabs/flutter-apns
 
 publish_to: 'none'

diff --git a/flutter_apns_only/ios/Classes/FlutterApnsPlugin.swift b/flutter_apns_only/ios/Classes/FlutterApnsPlugin.swift
@@ -48,6 +48,10 @@ func getFlutterError(_ error: Error) -> FlutterError {
         case "setNotificationCategories":
             setNotificationCategories(arguments: call.arguments!)
             result(nil)
+        case "getNotificationSettings":
+            getNotificationSettings(){(value) in
+                result(value)
+            }
         default:
             assertionFailure(call.method)
             result(FlutterMethodNotImplemented)
@@ -105,6 +109,23 @@ func getFlutterError(_ error: Error) -> FlutterError {
         }
     }
 
+    func getNotificationSettings(completion: @escaping (([String: Bool]) -> Void)){
+        let center = UNUserNotificationCenter.current()
+        let application = UIApplication.shared
+
+        assert(center.delegate != nil)
+
+        center.getNotificationSettings { (settings) in
+            let map = [
+                "sound": settings.soundSetting == .enabled,
+                "badge": settings.badgeSetting == .enabled,
+                "alert": settings.alertSetting == .enabled,
+                "carPlay": settings.carPlaySetting == .enabled,
+            ]
+            completion(map)
+        }
+    }
+
     func requestNotificationPermissions(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
         let center = UNUserNotificationCenter.current()
         let application = UIApplication.shared
@@ -130,14 +151,6 @@ func getFlutterError(_ error: Error) -> FlutterError {
         if readBool("carPlay") {
            options.append(.carPlay)
         }
-
-        var provisionalRequested = false
-        if #available(iOS 12.0, *) {
-            if readBool("provisional") {
-                options.append(.provisional)
-                provisionalRequested = true
-            }
-        }
 
 
         let optionsUnion = UNAuthorizationOptions(options)
@@ -148,16 +161,9 @@ func getFlutterError(_ error: Error) -> FlutterError {
                 return
             }
 
-            center.getNotificationSettings { (settings) in
-                let map = [
-                    "sound": settings.soundSetting == .enabled,
-                    "badge": settings.badgeSetting == .enabled,
-                    "alert": settings.alertSetting == .enabled,
-                    "carPlay": settings.carPlaySetting == .enabled,
-                    "provisional": granted && provisionalRequested
-                ]
-
-                self.channel.invokeMethod("onIosSettingsRegistered", arguments: map)
+            self.getNotificationSettings(){(value) in
+                self.channel.invokeMethod("onIosSettingsRegistered", arguments: value)
+
             }
 
             result(granted)

diff --git a/flutter_apns_only/lib/flutter_apns_only.dart b/flutter_apns_only/lib/flutter_apns_only.dart
@@ -68,9 +68,9 @@ class ApnsPushConnectorOnly {
         return null;
       case 'onIosSettingsRegistered':
         final obj = IosNotificationSettings._fromMap(call.arguments.cast<String, bool>());
-
+        _iosSettingsStreamController.add(obj);
         isDisabledByUser.value = obj.alert == false;
-        return null;
+        return;
       case 'onMessage':
         return _onMessage?.call(_extractMessage(call));
       case 'onLaunch':
@@ -128,6 +128,12 @@ class ApnsPushConnectorOnly {
     );
   }
 
+  /// https://developer.apple.com/documentation/usernotifications/unnotificationsettings/
+  Future<IosNotificationSettings> getNotificationSettings() async {
+    final result = await _channel.invokeMethod<Map<String, dynamic>>('getNotificationSettings');
+    return IosNotificationSettings._fromMap(result as Map<String, bool>);
+  }
+
   Future<void> unregister() async {
     await _channel.invokeMethod('unregister');
     token.value = null;

diff --git a/flutter_apns_only/pubspec.yaml b/flutter_apns_only/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_apns_only
 description: APNS push notification plugin. Works only on iOS. See flutter_apns for apns & firebase combo
-version: 1.7.3
+version: 1.7.5
 homepage: https://github.com/mwaylabs/flutter-apns
 
 environment: