Add notification options types (#397)

rlepinski · Ulrico972 · web-flow · commit c67c682caacc · 2022-02-08T14:56:55.000-08:00
* Implementation

* Types updates

* Android impl

* Fixes

Co-authored-by: Ulrich Giberne &lt;ulrich.giberne@airship.com&gt;
diff --git a/urbanairship-react-native/android/src/main/java/com/urbanairship/reactnative/UrbanAirshipReactModule.java b/urbanairship-react-native/android/src/main/java/com/urbanairship/reactnative/UrbanAirshipReactModule.java
@@ -49,6 +49,7 @@
 import com.urbanairship.messagecenter.Inbox;
 import com.urbanairship.messagecenter.Message;
 import com.urbanairship.messagecenter.MessageCenter;
+import com.urbanairship.push.PushManager;
 import com.urbanairship.push.PushMessage;
 import com.urbanairship.reactnative.events.NotificationOptInEvent;
 import com.urbanairship.reactnative.events.PushReceivedEvent;
@@ -310,6 +311,21 @@ public void isSystemNotificationsEnabledForApp(Promise promise) {
         promise.resolve(NotificationManagerCompat.from(getReactApplicationContext()).areNotificationsEnabled());
     }
 
+    /**
+     * Gets the notification status.
+     *
+     * @param promise The JS promise.
+     */
+    @ReactMethod
+    public void getNotificationStatus(Promise promise) {
+        WritableMap result = Arguments.createMap();
+        PushManager push = UAirship.shared().getPushManager();
+        result.putBoolean("airshipOptIn", push.isOptIn());
+        result.putBoolean("airshipEnabled", push.getUserNotificationsEnabled());
+        result.putBoolean("systemEnabled", NotificationManagerCompat.from(getReactApplicationContext()).areNotificationsEnabled());
+        promise.resolve(result);
+    }
+
     @ReactMethod
     @RequiresApi(api = Build.VERSION_CODES.O)
     public void getNotificationChannelStatus(String channelId, Promise promise) {
diff --git a/urbanairship-react-native/ios/UARCTModule.xcodeproj/project.pbxproj b/urbanairship-react-native/ios/UARCTModule.xcodeproj/project.pbxproj
@@ -11,6 +11,7 @@
 		6E42C7AF1EBA953100C85B3A /* UARCTAutopilot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E42C7AC1EBA953100C85B3A /* UARCTAutopilot.m */; };
 		6E42C7B01EBA953100C85B3A /* UrbanAirshipReactModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E42C7AE1EBA953100C85B3A /* UrbanAirshipReactModule.m */; };
 		6E42C8551EC0DD0900C85B3A /* UARCTEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E42C8541EC0DD0900C85B3A /* UARCTEventEmitter.m */; };
+		6E6C3FA427AB41C8007F55C7 /* UARCTUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E6C3FA327AB41C8007F55C7 /* UARCTUtils.m */; };
 		6ED67C292318812700169F5C /* UARCTMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ED67C252318812700169F5C /* UARCTMessageView.m */; };
 		6ED67C2A2318812700169F5C /* UARCTMessageViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ED67C282318812700169F5C /* UARCTMessageViewManager.m */; };
 		6ED701FA1F6C91A400E67C37 /* UARCTDeepLinkAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ED701F91F6C91A400E67C37 /* UARCTDeepLinkAction.m */; };
@@ -39,6 +40,8 @@
 		6E42C8531EC0DD0900C85B3A /* UARCTEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UARCTEventEmitter.h; path = UARCTModule/UARCTEventEmitter.h; sourceTree = "<group>"; };
 		6E42C8541EC0DD0900C85B3A /* UARCTEventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UARCTEventEmitter.m; path = UARCTModule/UARCTEventEmitter.m; sourceTree = "<group>"; };
 		6E4D17C21EBA7FAA0032DED3 /* libUARCTModule.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libUARCTModule.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		6E6C3FA227AB41C8007F55C7 /* UARCTUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UARCTUtils.h; path = UARCTModule/UARCTUtils.h; sourceTree = "<group>"; };
+		6E6C3FA327AB41C8007F55C7 /* UARCTUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UARCTUtils.m; path = UARCTModule/UARCTUtils.m; sourceTree = "<group>"; };
 		6ED67C252318812700169F5C /* UARCTMessageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UARCTMessageView.m; path = UARCTModule/UARCTMessageView.m; sourceTree = "<group>"; };
 		6ED67C262318812700169F5C /* UARCTMessageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UARCTMessageView.h; path = UARCTModule/UARCTMessageView.h; sourceTree = "<group>"; };
 		6ED67C272318812700169F5C /* UARCTMessageViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UARCTMessageViewManager.h; path = UARCTModule/UARCTMessageViewManager.h; sourceTree = "<group>"; };
@@ -63,6 +66,8 @@
 		6E4D17341EBA7C100032DED3 /* UARCTModule */ = {
 			isa = PBXGroup;
 			children = (
+				6E6C3FA227AB41C8007F55C7 /* UARCTUtils.h */,
+				6E6C3FA327AB41C8007F55C7 /* UARCTUtils.m */,
 				6ED67C262318812700169F5C /* UARCTMessageView.h */,
 				6ED67C252318812700169F5C /* UARCTMessageView.m */,
 				6ED67C272318812700169F5C /* UARCTMessageViewManager.h */,
@@ -167,6 +172,7 @@
 			files = (
 				457511BA23A41C7A00E4B1AD /* UARCTModuleVersion.m in Sources */,
 				6E42C7AF1EBA953100C85B3A /* UARCTAutopilot.m in Sources */,
+				6E6C3FA427AB41C8007F55C7 /* UARCTUtils.m in Sources */,
 				6ED67C292318812700169F5C /* UARCTMessageView.m in Sources */,
 				6E42C8551EC0DD0900C85B3A /* UARCTEventEmitter.m in Sources */,
 				6E42C7B01EBA953100C85B3A /* UrbanAirshipReactModule.m in Sources */,
diff --git a/urbanairship-react-native/ios/UARCTModule/UARCTEventEmitter.h b/urbanairship-react-native/ios/UARCTModule/UARCTEventEmitter.h
@@ -11,10 +11,6 @@
 @import AirshipKit;
 #endif
 
-extern NSString *const UARCTNotificationPresentationAlertKey;
-extern NSString *const UARCTNotificationPresentationBadgeKey;
-extern NSString *const UARCTNotificationPresentationSoundKey;
-
 /**
  * Listeners for Urban Airship events and emits them to the JS layer.
  */
diff --git a/urbanairship-react-native/ios/UARCTModule/UARCTEventEmitter.m b/urbanairship-react-native/ios/UARCTModule/UARCTEventEmitter.m
@@ -1,6 +1,7 @@
 /* Copyright Urban Airship and Contributors */
 
 #import "UARCTEventEmitter.h"
+#import "UARCTUtils.h"
 
 @interface UARCTEventEmitter()
 @property(nonatomic, strong) NSMutableArray *pendingEvents;
@@ -20,17 +21,6 @@ @interface UARCTEventEmitter()
 NSString *const UARCTOpenPreferenceCenterEventName = @"com.urbanairship.open_preference_center";
 NSString *const UAChannelUpdatedEventChannelKey = @"com.urbanairship.channel.identifier";
 
-NSString *const UARCTNotificationPresentationAlertKey = @"alert";
-NSString *const UARCTNotificationPresentationBadgeKey = @"badge";
-NSString *const UARCTNotificationPresentationSoundKey = @"sound";
-
-NSString *const UARCTAuthorizedNotificationSettingsAlertKey = UARCTNotificationPresentationAlertKey;
-NSString *const UARCTAuthorizedNotificationSettingsBadgeKey = UARCTNotificationPresentationBadgeKey;
-NSString *const UARCTAuthorizedNotificationSettingsSoundKey = UARCTNotificationPresentationSoundKey;
-NSString *const UARCTAuthorizedNotificationSettingsCarPlayKey = @"carPlay";
-NSString *const UARCTAuthorizedNotificationSettingsLockScreenKey = @"lockScreen";
-NSString *const UARCTAuthorizedNotificationSettingsNotificationCenterKey = @"notificationCenter";
-
 NSString *const UARCTEventNameKey = @"name";
 NSString *const UARCTEventBodyKey = @"body";
 
@@ -154,61 +144,22 @@ - (void)channelRegistrationSucceeded:(NSNotification *)notification {
 #pragma mark UARegistrationDelegate
 
 - (void)notificationAuthorizedSettingsDidChange:(UAAuthorizedNotificationSettings)authorizedSettings {
-    BOOL optedIn = NO;
-
-    BOOL alertBool = NO;
-    BOOL badgeBool = NO;
-    BOOL soundBool = NO;
-    BOOL carPlayBool = NO;
-    BOOL lockScreenBool = NO;
-    BOOL notificationCenterBool = NO;
-
-    if (authorizedSettings & UAAuthorizedNotificationSettingsAlert) {
-        alertBool = YES;
-    }
-
-    if (authorizedSettings & UAAuthorizedNotificationSettingsBadge) {
-        badgeBool = YES;
-    }
-
-    if (authorizedSettings & UAAuthorizedNotificationSettingsSound) {
-        soundBool = YES;
-    }
-
-    if (authorizedSettings & UAAuthorizedNotificationSettingsCarPlay) {
-        carPlayBool = YES;
-    }
-
-    if (authorizedSettings & UAAuthorizedNotificationSettingsLockScreen) {
-        lockScreenBool = YES;
-    }
-
-    if (authorizedSettings & UAAuthorizedNotificationSettingsNotificationCenter) {
-        notificationCenterBool = YES;
-    }
-
-    optedIn = authorizedSettings != UAAuthorizedNotificationSettingsNone;
-
-    NSDictionary *body = @{  @"optIn": @(optedIn),
-                             @"authorizedNotificationSettings" : @{
-                                     UARCTAuthorizedNotificationSettingsAlertKey : @(alertBool),
-                                     UARCTAuthorizedNotificationSettingsBadgeKey : @(badgeBool),
-                                     UARCTAuthorizedNotificationSettingsSoundKey : @(soundBool),
-                                     UARCTAuthorizedNotificationSettingsCarPlayKey : @(carPlayBool),
-                                     UARCTAuthorizedNotificationSettingsLockScreenKey : @(lockScreenBool),
-                                     UARCTAuthorizedNotificationSettingsNotificationCenterKey : @(notificationCenterBool)
-                             }};
-
+    NSDictionary *body = @{
+        @"optIn": @(authorizedSettings != UAAuthorizedNotificationSettingsNone),
+        @"authorizedNotificationSettings": [UARCTUtils authorizedSettingsDictionary:authorizedSettings],
+        @"authorizedSettings": [UARCTUtils authorizedSettingsArray:authorizedSettings]
+    };
     [self sendEventWithName:UARCTOptInStatusChangedEventName body:body];
 }
 
 #pragma mark -
 #pragma mark Message Center
 
 - (void)inboxUpdated {
-    NSDictionary *body = @{ @"messageUnreadCount": @([UAMessageCenter shared].messageList.unreadCount),
-                            @"messageCount": @([UAMessageCenter shared].messageList.messageCount)
-                            };
+    NSDictionary *body = @{
+        @"messageUnreadCount": @([UAMessageCenter shared].messageList.unreadCount),
+        @"messageCount": @([UAMessageCenter shared].messageList.messageCount)
+    };
 
     [self sendEventWithName:UARCTInboxUpdatedEventName body:body];
 }
diff --git a/urbanairship-react-native/ios/UARCTModule/UARCTUtils.h b/urbanairship-react-native/ios/UARCTModule/UARCTUtils.h
@@ -0,0 +1,17 @@
+#if __has_include("AirshipLib.h")
+#import "AirshipLib.h"
+#else
+@import AirshipKit;
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UARCTUtils : NSObject
+
++ (UANotificationOptions)optionsFromOptionsArray:(NSArray *)options;
++ (NSArray<NSString *> *)authorizedSettingsArray:(UAAuthorizedNotificationSettings)settings;
++ (NSDictionary *)authorizedSettingsDictionary:(UAAuthorizedNotificationSettings)settings;
++ (NSString *)authorizedStatusString:(UAAuthorizationStatus)status;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/urbanairship-react-native/ios/UARCTModule/UARCTUtils.m b/urbanairship-react-native/ios/UARCTModule/UARCTUtils.m
@@ -0,0 +1,103 @@
+#import "UARCTUtils.h"
+
+@implementation UARCTUtils
+
++ (NSString *)authorizedStatusString:(UAAuthorizationStatus)status {
+    switch (status) {
+        case UAAuthorizationStatusDenied:
+            return @"denied";
+        case UAAuthorizationStatusEphemeral:
+            return @"ephemeral";
+        case UAAuthorizationStatusAuthorized:
+            return @"authorized";
+        case UAAuthorizationStatusProvisional:
+            return @"provisional";
+        case UAAuthorizationStatusNotDetermined:
+        default:
+            return @"notDetermined";
+    }
+}
+
++ (UANotificationOptions)optionsFromOptionsArray:(NSArray *)options {
+    UANotificationOptions notificationOptions = UANotificationOptionNone;
+
+    if ([options containsObject:@"alert"]) {
+        notificationOptions = notificationOptions | UANotificationOptionAlert;
+    }
+
+    if ([options containsObject:@"badge"]) {
+        notificationOptions = notificationOptions | UANotificationOptionBadge;
+    }
+
+    if ([options containsObject:@"sound"]) {
+        notificationOptions = notificationOptions | UANotificationOptionSound;
+    }
+    
+    if ([options containsObject:@"carPlay"]) {
+        notificationOptions = notificationOptions | UANotificationOptionCarPlay;
+    }
+    
+    if ([options containsObject:@"criticalAlert"]) {
+        notificationOptions = notificationOptions | UANotificationOptionCriticalAlert;
+    }
+    
+    if ([options containsObject:@"providesAppNotificationSettings"]) {
+        notificationOptions = notificationOptions | UANotificationOptionProvidesAppNotificationSettings;
+    }
+    
+    if ([options containsObject:@"provisional"]) {
+        notificationOptions = notificationOptions | UANotificationOptionProvisional;
+    }
+    
+    return notificationOptions;
+}
+
++ (NSArray<NSString *> *)authorizedSettingsArray:(UAAuthorizedNotificationSettings)settings {
+    NSMutableArray *settingsArray = [NSMutableArray array];
+    if (settings & UAAuthorizedNotificationSettingsAlert) {
+        [settingsArray addObject:@"alert"];
+    }
+    if (settings & UAAuthorizedNotificationSettingsBadge) {
+        [settingsArray addObject:@"badge"];
+    }
+    if (settings & UAAuthorizedNotificationSettingsSound) {
+        [settingsArray addObject:@"sound"];
+    }
+    if (settings & UAAuthorizedNotificationSettingsCarPlay) {
+        [settingsArray addObject:@"carPlay"];
+    }
+    if (settings & UAAuthorizedNotificationSettingsLockScreen) {
+        [settingsArray addObject:@"lockScreen"];
+    }
+    if (settings & UAAuthorizedNotificationSettingsNotificationCenter) {
+        [settingsArray addObject:@"notificationCenter"];
+    }
+    if (settings & UAAuthorizedNotificationSettingsAnnouncement) {
+        [settingsArray addObject:@"announcement"];
+    }
+    if (settings & UAAuthorizedNotificationSettingsScheduledDelivery) {
+        [settingsArray addObject:@"scheduledDelivery"];
+    }
+    if (settings & UAAuthorizedNotificationSettingsTimeSensitive) {
+        [settingsArray addObject:@"timeSensitive"];
+    }
+    
+    return settingsArray;
+}
+
++ (NSDictionary *)authorizedSettingsDictionary:(UAAuthorizedNotificationSettings)settings {
+    return @{
+        @"alert" : @(settings & UAAuthorizedNotificationSettingsAlert),
+        @"badge" : @(settings & UAAuthorizedNotificationSettingsBadge),
+        @"sound" : @(settings & UAAuthorizedNotificationSettingsSound),
+        @"carPlay" : @(settings & UAAuthorizedNotificationSettingsCarPlay),
+        @"lockScreen" : @(settings & UAAuthorizedNotificationSettingsLockScreen),
+        @"notificationCenter" : @(settings & UAAuthorizedNotificationSettingsNotificationCenter),
+        @"criticalAlert" : @(settings & UAAuthorizedNotificationSettingsNotificationCenter),
+        @"announcement" : @(settings & UAAuthorizedNotificationSettingsNotificationCenter),
+        @"scheduledDelivery" : @(settings & UAAuthorizedNotificationSettingsNotificationCenter),
+        @"timeSensitive" : @(settings & UAAuthorizedNotificationSettingsNotificationCenter),
+    };
+}
+
+@end
diff --git a/urbanairship-react-native/ios/UARCTModule/UrbanAirshipReactModule.m b/urbanairship-react-native/ios/UARCTModule/UrbanAirshipReactModule.m
@@ -5,6 +5,7 @@
 #import "UARCTDeepLinkAction.h"
 #import "UARCTAutopilot.h"
 #import "UARCTMessageCenter.h"
+#import "UARCTUtils.h"
 
 #if __has_include("AirshipLib.h")
 #import "UAInAppMessageHTMLAdapter.h"
@@ -424,34 +425,56 @@ + (BOOL)requiresMainQueueSetup {
 
 }
 
-RCT_EXPORT_METHOD(setForegroundPresentationOptions:(NSDictionary *)options) {
+RCT_EXPORT_METHOD(setNotificationOptions:(NSArray *)options) {
+    UANotificationOptions notificationOptions = [UARCTUtils optionsFromOptionsArray:options];
+    UA_LDEBUG(@"Notification options set: %lu from dictionary: %@", (unsigned long)notificationOptions, options);
+    UAirship.push.notificationOptions = notificationOptions;
+    [UAirship.push updateRegistration];
+}
+
+RCT_EXPORT_METHOD(setForegroundPresentationOptions:(NSArray *)options) {
     UNNotificationPresentationOptions presentationOptions = UNNotificationPresentationOptionNone;
 
-    if (options[UARCTNotificationPresentationAlertKey] != nil) {
-        if ([options[UARCTNotificationPresentationAlertKey] boolValue]) {
-            presentationOptions = presentationOptions | UNNotificationPresentationOptionAlert;
-        }
+    if ([options containsObject:@"alert"]) {
+        presentationOptions = presentationOptions | UNNotificationPresentationOptionAlert;
     }
 
-    if (options[UARCTNotificationPresentationBadgeKey] != nil) {
-        if ([options[UARCTNotificationPresentationBadgeKey] boolValue]) {
-            presentationOptions = presentationOptions | UNNotificationPresentationOptionBadge;
-        }
+    if ([options containsObject:@"badge"]) {
+        presentationOptions = presentationOptions | UNNotificationPresentationOptionBadge;
     }
 
-    if (options[UARCTNotificationPresentationSoundKey] != nil) {
-        if ([options[UARCTNotificationPresentationSoundKey] boolValue]) {
-            presentationOptions = presentationOptions | UNNotificationPresentationOptionSound;
-        }
+    if ([options containsObject:@"sound"]) {
+        presentationOptions = presentationOptions | UNNotificationPresentationOptionSound;
     }
-
+    
     UA_LDEBUG(@"Foreground presentation options set: %lu from dictionary: %@", (unsigned long)presentationOptions, options);
 
     [UAirship push].defaultPresentationOptions = presentationOptions;
     [[NSUserDefaults standardUserDefaults] setInteger:presentationOptions
                                                forKey:UARCTPresentationOptionsStorageKey];
 }
 
+
+RCT_REMAP_METHOD(getNotificationStatus,
+                 getNotificationStatus_resolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject) {
+    
+    UAPush *push = UAirship.push;
+    BOOL isSystemEnabled = push.authorizedNotificationSettings != 0;
+    id result = @{
+        @"airshipOptIn": @(push.isPushNotificationsOptedIn),
+        @"airshipEnabled": @(push.userPushNotificationsEnabled),
+        @"systemEnabled": @(isSystemEnabled),
+        @"ios": @{
+            @"authorizedSettings": [UARCTUtils authorizedSettingsArray:push.authorizedNotificationSettings],
+            @"authorizedStatus": [UARCTUtils authorizedStatusString:push.authorizationStatus]
+        }
+    };
+    
+    resolve(result);
+}
+
+
 RCT_EXPORT_METHOD(setAutobadgeEnabled:(BOOL)enabled) {
     [UAirship push].autobadgeEnabled = enabled;
 }
diff --git a/urbanairship-react-native/js/UrbanAirship.ts b/urbanairship-react-native/js/UrbanAirship.ts
