Sending updated notification types and push token

Author: emawby

iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UIApplicationDelegate+OneSignalNotifications.m

@@ -113,7 +113,7 @@ - (void)oneSignalDidRegisterForRemoteNotifications:(UIApplication*)app deviceTok
 - (void)oneSignalDidFailRegisterForRemoteNotification:(UIApplication*)app error:(NSError*)err {
     [OneSignalNotificationsAppDelegate traceCall:@"oneSignalDidFailRegisterForRemoteNotification:error:"];
 
-    if ([OSNotificationsManager getAppId])
+    if ([OneSignalConfigManager getAppId])
         [OSNotificationsManager handleDidFailRegisterForRemoteNotification:err];
 
     SwizzlingForwarder *forwarder = [[SwizzlingForwarder alloc]
@@ -147,7 +147,7 @@ - (void) oneSignalReceiveRemoteNotification:(UIApplication*)application UserInfo
 
     BOOL startedBackgroundJob = false;
 
-    if ([OSNotificationsManager getAppId]) {
+    if ([OneSignalConfigManager getAppId]) {
         let appState = [UIApplication sharedApplication].applicationState;
         let isVisibleNotification = userInfo[@"aps"][@"alert"] != nil;
 

iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m

@@ -277,7 +277,7 @@ void finishProcessingNotification(UNNotification *notification,
 
     [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"Notification display type: %lu", (unsigned long)displayType]];
 
-    if ([OSNotificationsManager getAppId])
+    if ([OneSignalConfigManager getAppId])
         [OSNotificationsManager notificationReceived:notification.request.content.userInfo wasOpened:NO];
 
 
@@ -353,7 +353,7 @@ + (BOOL)isDismissEvent:(UNNotificationResponse *)response {
 }
 
 + (void)processiOS10Open:(UNNotificationResponse*)response {
-    if (![OSNotificationsManager getAppId])
+    if (![OneSignalConfigManager getAppId])
         return;
 
     if ([OneSignalNotificationsUNUserNotificationCenter isDismissEvent:response])

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.h

@@ -67,11 +67,9 @@ typedef void (^OSNotificationOpenedBlock)(OSNotificationOpenedResult * _Nonnull
 @property (class, weak, nonatomic, nullable) id<OneSignalNotificationsDelegate> delegate;
 
 + (Class<OSNotifications> _Nonnull)Notifications;
-
++ (void)start;
 + (void)setColdStartFromTapOnNotification:(BOOL)coldStartFromTapOnNotification;
 + (BOOL)getColdStartFromTapOnNotification;
-+ (void)setAppId:(NSString *_Nullable)appId;
-+ (NSString *_Nullable)getAppId;
 
 @property (class, readonly) OSPermissionStateInternal* _Nonnull currentPermissionState;
 @property (class) OSPermissionStateInternal* _Nonnull lastPermissionState;

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m

@@ -32,6 +32,8 @@ of this software and associated documentation files (the "Software"), to deal
 #import "OSNotification+OneSignal.h"
 #import <OneSignalExtension/OneSignalAttachmentHandler.h>
 #import "OneSignalWebViewManager.h"
+#import "UNUserNotificationCenter+OneSignalNotifications.h"
+#import "UIApplicationDelegate+OneSignalNotifications.h"
 
 @implementation OSNotificationOpenedResult
 @synthesize notification = _notification, action = _action;
@@ -183,6 +185,25 @@ + (void)setPushSubscriptionId:(NSString *)pushSubscriptionId {
     _pushSubscriptionId = pushSubscriptionId;
 }
 
++ (void)start {
+    // Swizzle - UIApplication delegate
+    //TODO: do the equivalent in the notificaitons module
+    injectSelector(
+        [UIApplication class],
+        @selector(setDelegate:),
+        [OneSignalNotificationsAppDelegate class],
+        @selector(setOneSignalDelegate:)
+   );
+    //TODO: This swizzling is done from notifications module
+    injectSelector(
+        [UIApplication class],
+        @selector(setApplicationIconBadgeNumber:),
+        [OneSignalNotificationsAppDelegate class],
+        @selector(onesignalSetApplicationIconBadgeNumber:)
+    );
+    [OneSignalNotificationsUNUserNotificationCenter setup];
+}
+
 + (void)resetLocals {
     _lastMessageReceived = nil;
     _lastMessageIdFromAction = nil;
@@ -354,10 +375,8 @@ + (void)didRegisterForRemoteNotifications:(UIApplication *)app
 
     self.waitingForApnsResponse = false;
 
-    if (!_appId)
-        return;
-
     _pushToken = parsedDeviceToken;
+
     [self sendPushTokenToDelegate];
 }
 

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSUserRequests.swift

@@ -27,6 +27,7 @@
 
 import OneSignalCore
 import OneSignalNotifications
+import OneSignalOSCore
 
 /**
  Involved in the login process and responsible for Identify User and Create User.
@@ -774,7 +775,9 @@ class OSRequestUpdateSubscription: OneSignalRequest, OSUserRequest {
         // Rename "address" key as "token", if it exists
         var subscriptionParams = subscriptionObject
         subscriptionParams.removeValue(forKey: "address")
+        subscriptionParams.removeValue(forKey: "notificationTypes")
         subscriptionParams["token"] = subscriptionObject["address"]
+        subscriptionParams["notification_types"] = subscriptionObject["notificationTypes"]
 
         self.parameters = ["subscription": subscriptionParams]
         self.method = PATCH

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -842,23 +842,8 @@ + (void)load {
         return;
     }
 
-    // Swizzle - UIApplication delegate
-    //TODO: do the equivalent in the notificaitons module
-    injectSelector(
-        [UIApplication class],
-        @selector(setDelegate:),
-        [OneSignalAppDelegate class],
-        @selector(setOneSignalDelegate:)
-   );
-    //TODO: This swizzling is done from notifications module
-    injectSelector(
-        [UIApplication class],
-        @selector(setApplicationIconBadgeNumber:),
-        [OneSignalAppDelegate class],
-        @selector(onesignalSetApplicationIconBadgeNumber:)
-    );
-    //TODO: Do this in the notifications module
-    [self setupUNUserNotificationCenterDelegate];
+    [OSNotificationsManager start];
+
     [[OSMigrationController new] migrate];
     sessionLaunchTime = [NSDate date];
 
@@ -875,14 +860,6 @@ - (void)onesignalSetApplicationIconBadgeNumber:(NSInteger)badge {
     [self onesignalSetApplicationIconBadgeNumber:badge];
 }
 
-+(void)setupUNUserNotificationCenterDelegate {
-    // Swizzle - UNUserNotificationCenter delegate - iOS 10+
-    if (!NSClassFromString(@"UNUserNotificationCenter"))
-        return;
-
-    //[OneSignalUNUserNotificationCenter setup]; TODO: do this is notifications
-}
-
 +(BOOL) shouldDisableBasedOnProcessArguments {
     if ([NSProcessInfo.processInfo.arguments containsObject:@"DISABLE_ONESIGNAL_SWIZZLING"]) {
         return YES;