wip

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift

@@ -274,6 +274,10 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
                 OneSignalLog.onesignalLog(.LL_DEBUG, message: "OneSignalUserManager: creating user linked to legacy subscription \(legacyPlayerId)")
                 createUserFromLegacyPlayer(legacyPlayerId)
                 OneSignalUserDefaults.initShared().saveString(forKey: OSUD_PUSH_SUBSCRIPTION_ID, withValue: legacyPlayerId)
+                // Mirror to OSResilientStorage as well — createDefaultPushSubscription sets the id
+                // via the initializer, so subscriptionId.didSet (which normally writes the mirror)
+                // does not fire here. Keeps the prewarm fallback populated for migrated v3 players.
+                OSResilientStorage.setString(legacyPlayerId, forKey: OSResilientStorage.keySubscriptionId)
                 OneSignalUserDefaults.initStandard().removeValue(forKey: OSUD_LEGACY_PLAYER_ID)
                 OneSignalUserDefaults.initShared().removeValue(forKey: OSUD_LEGACY_PLAYER_ID)
             } else {

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -469,13 +469,6 @@ + (void)init {
     static _Atomic(BOOL) gProtectedDataAvailable = NO;
     static dispatch_once_t protectedDataOnce;
     dispatch_once(&protectedDataOnce, ^{
-        // Seed the cache on the main thread once. UIApplication APIs are main-thread-only.
-        // On a normal launch this resolves to YES near-immediately; on a prewarm launch
-        // before first unlock it stays NO and the notification will flip it later.
-        dispatch_async(dispatch_get_main_queue(), ^{
-            atomic_store(&gProtectedDataAvailable, UIApplication.sharedApplication.isProtectedDataAvailable);
-        });
-
         NSNotificationCenter *center = NSNotificationCenter.defaultCenter;
         [center addObserverForName:UIApplicationProtectedDataDidBecomeAvailable
                             object:nil
@@ -497,6 +490,25 @@ + (void)init {
         OneSignalConfig.isProtectedDataAvailableProvider = ^BOOL {
             return atomic_load(&gProtectedDataAvailable);
         };
+
+        // Seed the cached flag. UIApplication APIs are main-thread-only. `initialize` is normally
+        // called from `application:didFinishLaunchingWithOptions:` on the main thread, so seed
+        // synchronously here — that way the flag is correct before `startUserManager` runs later
+        // in this same `init`. If we're off the main thread, hop to main to read it; once it
+        // resolves to available, re-drive `start()`, because the synchronous `start()` below will
+        // have been gated out and a normal (already-unlocked) launch never posts
+        // UIApplicationProtectedDataDidBecomeAvailable to re-drive it.
+        if ([NSThread isMainThread]) {
+            atomic_store(&gProtectedDataAvailable, UIApplication.sharedApplication.isProtectedDataAvailable);
+        } else {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                BOOL available = UIApplication.sharedApplication.isProtectedDataAvailable;
+                atomic_store(&gProtectedDataAvailable, available);
+                if (available) {
+                    [OneSignalUserManagerImpl.sharedInstance start];
+                }
+            });
+        }
     });
 
     // TODO: We moved this check to the top of this method, we should test this.