[flutter_local_notifications] removed redundant null aware operators (#…

…2188) * removed redundant null aware warnings * Clang Format --------- Co-authored-by: runner <runner@Mac-1703673798048.local>
MaikuB · Dec 27, 2023 · a75c9c8 · a75c9c8
1 parent 9cd9a50
commit a75c9c8
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 66 deletions.
diff --git a/flutter_local_notifications/ios/Classes/FlutterLocalNotificationsPlugin.m b/flutter_local_notifications/ios/Classes/FlutterLocalNotificationsPlugin.m
@@ -558,70 +558,78 @@ - (void)requestPermissionsImpl:(bool)soundPermission
 - (void)checkPermissions:(NSDictionary *_Nonnull)arguments
 
                   result:(FlutterResult _Nonnull)result {
-    if (@available(iOS 10.0, *)) {
-        UNUserNotificationCenter *center =
+  if (@available(iOS 10.0, *)) {
+    UNUserNotificationCenter *center =
         [UNUserNotificationCenter currentNotificationCenter];
-
-        [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
-            BOOL isEnabled = settings.authorizationStatus == UNAuthorizationStatusAuthorized;
-            BOOL isSoundEnabled = settings.soundSetting == UNNotificationSettingEnabled;
-            BOOL isAlertEnabled = settings.alertSetting == UNNotificationSettingEnabled;
-            BOOL isBadgeEnabled = settings.badgeSetting == UNNotificationSettingEnabled;
-            BOOL isProvisionalEnabled = false;
-            BOOL isCriticalEnabled = false;
-
-            if(@available(iOS 12.0, *)) {
-                isProvisionalEnabled = settings.authorizationStatus == UNAuthorizationStatusProvisional;
-                isCriticalEnabled = settings.criticalAlertSetting == UNNotificationSettingEnabled;
-            }
-
-            NSDictionary *dict = @{
-                IS_NOTIFICATIONS_ENABLED: @(isEnabled),
-                IS_SOUND_ENABLED: @(isSoundEnabled),
-                IS_ALERT_ENABLED: @(isAlertEnabled),
-                IS_BADGE_ENABLED: @(isBadgeEnabled),
-                IS_PROVISIONAL_ENABLED: @(isProvisionalEnabled),
-                IS_CRITICAL_ENABLED: @(isCriticalEnabled),
-            };
-
-            result(dict);
-        }];
-    } else {
+
+    [center getNotificationSettingsWithCompletionHandler:^(
+                UNNotificationSettings *_Nonnull settings) {
+      BOOL isEnabled =
+          settings.authorizationStatus == UNAuthorizationStatusAuthorized;
+      BOOL isSoundEnabled =
+          settings.soundSetting == UNNotificationSettingEnabled;
+      BOOL isAlertEnabled =
+          settings.alertSetting == UNNotificationSettingEnabled;
+      BOOL isBadgeEnabled =
+          settings.badgeSetting == UNNotificationSettingEnabled;
+      BOOL isProvisionalEnabled = false;
+      BOOL isCriticalEnabled = false;
+
+      if (@available(iOS 12.0, *)) {
+        isProvisionalEnabled =
+            settings.authorizationStatus == UNAuthorizationStatusProvisional;
+        isCriticalEnabled =
+            settings.criticalAlertSetting == UNNotificationSettingEnabled;
+      }
+
+      NSDictionary *dict = @{
+        IS_NOTIFICATIONS_ENABLED : @(isEnabled),
+        IS_SOUND_ENABLED : @(isSoundEnabled),
+        IS_ALERT_ENABLED : @(isAlertEnabled),
+        IS_BADGE_ENABLED : @(isBadgeEnabled),
+        IS_PROVISIONAL_ENABLED : @(isProvisionalEnabled),
+        IS_CRITICAL_ENABLED : @(isCriticalEnabled),
+      };
+
+      result(dict);
+    }];
+  } else {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        UIUserNotificationSettings *settings = UIApplication.sharedApplication.currentUserNotificationSettings;
-
-        if(settings == nil) {
-            result(@{
-                IS_NOTIFICATIONS_ENABLED: @NO,
-                IS_SOUND_ENABLED: @NO,
-                IS_ALERT_ENABLED: @NO,
-                IS_BADGE_ENABLED: @NO,
-                IS_PROVISIONAL_ENABLED: @NO,
-                IS_CRITICAL_ENABLED: @NO,
-            });
-            return;
-        }
-
-        UIUserNotificationType types = settings.types;
-
-        BOOL isEnabled = types != UIUserNotificationTypeNone;
-        BOOL isSoundEnabled = types & UIUserNotificationTypeSound;
-        BOOL isAlertEnabled = types & UIUserNotificationTypeAlert;
-        BOOL isBadgeEnabled = types & UIUserNotificationTypeBadge;
-
-        NSDictionary *dict = @{
-            IS_NOTIFICATIONS_ENABLED: @(isEnabled),
-            IS_SOUND_ENABLED: @(isSoundEnabled),
-            IS_ALERT_ENABLED: @(isAlertEnabled),
-            IS_BADGE_ENABLED: @(isBadgeEnabled),
-            IS_PROVISIONAL_ENABLED: @NO,
-            IS_CRITICAL_ENABLED: @NO,
-        };
-
-        result(dict);
-#pragma clang diagnostic pop
+    UIUserNotificationSettings *settings =
+        UIApplication.sharedApplication.currentUserNotificationSettings;
+
+    if (settings == nil) {
+      result(@{
+        IS_NOTIFICATIONS_ENABLED : @NO,
+        IS_SOUND_ENABLED : @NO,
+        IS_ALERT_ENABLED : @NO,
+        IS_BADGE_ENABLED : @NO,
+        IS_PROVISIONAL_ENABLED : @NO,
+        IS_CRITICAL_ENABLED : @NO,
+      });
+      return;
     }
+
+    UIUserNotificationType types = settings.types;
+
+    BOOL isEnabled = types != UIUserNotificationTypeNone;
+    BOOL isSoundEnabled = types & UIUserNotificationTypeSound;
+    BOOL isAlertEnabled = types & UIUserNotificationTypeAlert;
+    BOOL isBadgeEnabled = types & UIUserNotificationTypeBadge;
+
+    NSDictionary *dict = @{
+      IS_NOTIFICATIONS_ENABLED : @(isEnabled),
+      IS_SOUND_ENABLED : @(isSoundEnabled),
+      IS_ALERT_ENABLED : @(isAlertEnabled),
+      IS_BADGE_ENABLED : @(isBadgeEnabled),
+      IS_PROVISIONAL_ENABLED : @NO,
+      IS_CRITICAL_ENABLED : @NO,
+    };
+
+    result(dict);
+#pragma clang diagnostic pop
+  }
 }
 
 #pragma clang diagnostic push

diff --git a/flutter_local_notifications/test/ios_flutter_local_notifications_test.dart b/flutter_local_notifications/test/ios_flutter_local_notifications_test.dart
@@ -20,7 +20,7 @@ void main() {
     setUp(() {
       debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
       flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
-      TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
           .setMockMethodCallHandler(channel, (MethodCall methodCall) async {
         log.add(methodCall);
         if (methodCall.method == 'pendingNotificationRequests') {

diff --git a/flutter_local_notifications/test/macos_flutter_local_notifications_test.dart b/flutter_local_notifications/test/macos_flutter_local_notifications_test.dart
@@ -19,7 +19,7 @@ void main() {
     setUp(() {
       debugDefaultTargetPlatformOverride = TargetPlatform.macOS;
       flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
-      TestDefaultBinaryMessengerBinding.instance?.defaultBinaryMessenger
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
           .setMockMethodCallHandler(channel, (MethodCall methodCall) async {
         log.add(methodCall);
         if (methodCall.method == 'pendingNotificationRequests') {
@@ -526,11 +526,9 @@ void main() {
     test('checkPermissions', () async {
       await flutterLocalNotificationsPlugin
           .resolvePlatformSpecificImplementation<
-          MacOSFlutterLocalNotificationsPlugin>()!
+              MacOSFlutterLocalNotificationsPlugin>()!
           .checkPermissions();
-      expect(log, <Matcher>[
-        isMethodCall('checkPermissions', arguments: null)
-      ]);
+      expect(log, <Matcher>[isMethodCall('checkPermissions', arguments: null)]);
     });
 
     test('cancel', () async {