Add migration when application updated but not launched yet

  * If the application was upgraded but not launched and then a notification arrives,
    OneSignalNotificationServiceExtensionHandler, onNotificationReceived will fail due to accessing saved
    notifications ids without migration

Author: Jeasmine

iOS_SDK/OneSignalSDK/Source/OSMigrationController.m

@@ -54,23 +54,27 @@ - (void)migrate {
 - (void)migrateToVersion_02_14_00_AndGreater {
     let influenceVersion = 21400;
     let uniqueCacheOutcomeVersion = 21403;
-    let sdkVersion = [OneSignalUserDefaults.initShared getSavedIntegerForKey:OSUD_CACHED_SDK_VERSION defaultValue:0];
+    long sdkVersion = [OneSignalUserDefaults.initShared getSavedIntegerForKey:OSUD_CACHED_SDK_VERSION defaultValue:0];
     if (sdkVersion < influenceVersion) {
-        [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Migrating OSIndirectNotification from version: %d", sdkVersion]];
+        [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Migrating OSIndirectNotification from version: %ld", sdkVersion]];
 
         [NSKeyedUnarchiver setClass:[OSIndirectInfluence class] forClassName:@"OSIndirectNotification"];
         NSArray<OSIndirectInfluence *> * indirectInfluenceData = [[OneSignal influenceDataRepository] lastNotificationsReceivedData];
-        if (indirectInfluenceData)
+        if (indirectInfluenceData) {
+            [NSKeyedArchiver setClassName:@"OSIndirectInfluence" forClass:[OSIndirectInfluence class]];
             [[OneSignal influenceDataRepository] saveNotifications:indirectInfluenceData];
+        }
     }
 
     if (sdkVersion < uniqueCacheOutcomeVersion) {
-        [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Migrating OSUniqueOutcomeNotification from version: %d", sdkVersion]];
+        [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Migrating OSUniqueOutcomeNotification from version: %ld", sdkVersion]];
 
         [NSKeyedUnarchiver setClass:[OSCachedUniqueOutcome class] forClassName:@"OSUniqueOutcomeNotification"];
         NSArray<OSCachedUniqueOutcome *> * attributedCacheUniqueOutcomeEvents = [[OneSignal outcomeEventsCache] getAttributedUniqueOutcomeEventSent];
-        if (attributedCacheUniqueOutcomeEvents)
+        if (attributedCacheUniqueOutcomeEvents) {
+            [NSKeyedArchiver setClassName:@"OSCachedUniqueOutcome" forClass:[OSCachedUniqueOutcome class]];
             [[OneSignal outcomeEventsCache] saveAttributedUniqueOutcomeEventNotificationIds:attributedCacheUniqueOutcomeEvents];
+        }
     }
 }
 

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -2195,7 +2195,7 @@ + (void)updateNotificationTypes:(int)notificationTypes {
         return;
 
     if (!startedRegister && [self shouldRegisterNow])
-        [OneSignal registerUser];
+        [self registerUser];
     else
         [self sendNotificationTypesUpdate];
 

iOS_SDK/OneSignalSDK/Source/OneSignalNotificationServiceExtensionHandler.m

@@ -35,6 +35,7 @@
 #import "OneSignalInternal.h"
 #import "OneSignalReceiveReceiptsController.h"
 #import "OSSessionManager.h"
+#import "OSMigrationController.h"
 
 @implementation OneSignalNotificationServiceExtensionHandler
 
@@ -98,6 +99,8 @@ + (void)onNotificationReceived:(NSString *)receivedNotificationId {
     if (receivedNotificationId && ![receivedNotificationId isEqualToString:@""]) {
         // Track confirmed delivery
         [OneSignal.receiveReceiptsController sendReceiveReceiptWithNotificationId:receivedNotificationId];
+        // If update was made without app being initialized/launched before -> migrate
+        [[OSMigrationController new] migrate];
         [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"NSE request received, sessionManager: %@", [OneSignal sessionManager]]];
         // Save received notification id
         [[OneSignal sessionManager] onNotificationReceived:receivedNotificationId];

iOS_SDK/OneSignalSDK/UnitTests/MigrationTests.m

@@ -77,9 +77,13 @@ - (void)testIndirectNotificationToIndirectInfluenceMigration {
     NSMutableArray *indirectNotifications = [NSMutableArray new];
     [indirectNotifications addObject:indirectNotification];
 
+    [NSKeyedArchiver setClassName:@"OSIndirectNotification" forClass:[OSIndirectNotification class]];
     [dataRepository saveNotifications:indirectNotifications];
-    NSArray *lastNotificationReceived = [dataRepository lastNotificationsReceivedData];
+    [NSKeyedUnarchiver setClass:[OSIndirectNotification class] forClassName:@"OSIndirectNotification"];
+    NSArray<OSIndirectNotification *> *lastNotificationReceived = [dataRepository lastNotificationsReceivedData];
+    OSIndirectNotification *lastIndirectNotificationReceived = [lastNotificationReceived objectAtIndex:0];
     NSInteger sdkVersion = [OneSignalUserDefaults.initShared getSavedIntegerForKey:OSUD_CACHED_SDK_VERSION defaultValue:0];
+    XCTAssertTrue([lastIndirectNotificationReceived.notificationId isEqualToString:notificationId]);
     XCTAssertEqual(1, [lastNotificationReceived count]);
     XCTAssertEqual(0, sdkVersion);
 
@@ -125,6 +129,42 @@ - (void)testIndirectInfluenceToIndirectInfluenceMigration {
     XCTAssertEqual([[OneSignal sdk_version_raw] intValue], sdkVersionAfterMigration);
 }
 
+- (void)testIndirectNotificationToIndirectInfluenceMigration_NotificationServiceExtensionHandler {
+    NSString *notificationId = @"1234-5678-1234-5678-1234";
+    double timestamp = 10;
+    OSIndirectNotification *indirectNotification = [[OSIndirectNotification alloc] initWithParamsNotificationId:notificationId timestamp:timestamp];
+    NSMutableArray *indirectNotifications = [NSMutableArray new];
+    [indirectNotifications addObject:indirectNotification];
+   
+    [NSKeyedArchiver setClassName:@"OSIndirectNotification" forClass:[OSIndirectNotification class]];
+    [dataRepository saveNotifications:indirectNotifications];
+    [NSKeyedUnarchiver setClass:[OSIndirectNotification class] forClassName:@"OSIndirectNotification"];
+    NSArray<OSIndirectNotification *> *lastNotificationReceived = [dataRepository lastNotificationsReceivedData];
+    OSIndirectNotification *lastIndirectNotificationReceived = [lastNotificationReceived objectAtIndex:0];
+    NSInteger sdkVersion = [OneSignalUserDefaults.initShared getSavedIntegerForKey:OSUD_CACHED_SDK_VERSION defaultValue:0];
+    XCTAssertTrue([lastIndirectNotificationReceived.notificationId isEqualToString:notificationId]);
+    XCTAssertEqual(1, [lastNotificationReceived count]);
+    XCTAssertEqual(0, sdkVersion);
+   
+    // Receive notification
+    [UnitTestCommonMethods receiveNotification:@"test_notification_1" wasOpened:NO];
+    
+    NSArray<OSIndirectInfluence *> *lastNotificationReceivedAfterMigration = [dataRepository lastNotificationsReceivedData];
+    XCTAssertEqual(2, [lastNotificationReceivedAfterMigration count]);
+
+    OSIndirectInfluence *indirectInfluenceMigrated = [lastNotificationReceivedAfterMigration objectAtIndex:0];
+    XCTAssertTrue([indirectInfluenceMigrated.influenceId isEqualToString:notificationId]);
+    XCTAssertTrue([indirectInfluenceMigrated.channelIdTag isEqualToString:@"notification_id"]);
+    XCTAssertEqual(timestamp, indirectInfluenceMigrated.timestamp);
+    
+    OSIndirectInfluence *indirectInfluenceReceived = [lastNotificationReceivedAfterMigration objectAtIndex:1];
+    XCTAssertTrue([indirectInfluenceReceived.influenceId isEqualToString:@"test_notification_1"]);
+    XCTAssertTrue([indirectInfluenceReceived.channelIdTag isEqualToString:@"notification_id"]);
+   
+    NSInteger sdkVersionAfterMigration = [OneSignalUserDefaults.initShared getSavedIntegerForKey:OSUD_CACHED_SDK_VERSION defaultValue:0];
+    XCTAssertEqual([[OneSignal sdk_version_raw] intValue], sdkVersionAfterMigration);
+}
+
 - (void)testNoAttributedUniqueOutcomeDataAvailableToMigrate {
     NSArray *uniqueOutcomes = [outcomesCache getAttributedUniqueOutcomeEventSent];
     NSInteger sdkVersion = [OneSignalUserDefaults.initShared getSavedIntegerForKey:OSUD_CACHED_SDK_VERSION defaultValue:0];