Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[flutter_local_notifications] removed redundant null aware operators #2188

Merged
merged 2 commits into from
Dec 27, 2023
Merged

[flutter_local_notifications] removed redundant null aware operators #2188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dd99b1
removed redundant null aware warnings
MaikuB Dec 27, 2023
4a856d0
Clang Format
Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 68 additions & 60 deletions flutter_local_notifications/ios/Classes/FlutterLocalNotificationsPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion flutter_local_notifications/test/ios_flutter_local_notifications_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
8 changes: 3 additions & 5 deletions flutter_local_notifications/test/macos_flutter_local_notifications_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down Expand Up @@ -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 {
Expand Down
Loading