Read playerId and appId from OSResilientStorage in NSE if needed

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m

@@ -26,6 +26,7 @@
  */
 
 #import <OneSignalCore/OneSignalCore.h>
+#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import "OSMacros.h"
 #import <OneSignalOutcomes/OneSignalOutcomes.h>
 #import "OneSignalNotificationServiceExtensionHandler.h"
@@ -141,8 +142,19 @@ + (void)onNotificationReceived:(NSString *)receivedNotificationId withBlockingTa
 
         // Track confirmed delivery
         let sharedUserDefaults = OneSignalUserDefaults.initShared;
-        let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
-        let appId = [sharedUserDefaults getSavedStringForKey:OSUD_APP_ID defaultValue:nil];
+        NSString *playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
+        NSString *appId = [sharedUserDefaults getSavedStringForKey:OSUD_APP_ID defaultValue:nil];
+
+        // Fall back to the unencrypted cache if UserDefaults reads return nil.
+        // This handles cases where the NSE runs while the device is locked and the
+        // UserDefaults file (NSFileProtectionCompleteUntilFirstUserAuthentication) is not readable.
+        if (!playerId) {
+            playerId = [OSResilientStorage stringForKey:OSResilientStorage.keySubscriptionId];
+        }
+        if (!appId) {
+            appId = [OSResilientStorage stringForKey:OSResilientStorage.keyAppId];
+        }
+
         // Randomize send of confirmed deliveries to lessen traffic for high recipient notifications
         int randomDelay = semaphore != nil ? arc4random_uniform(MAX_CONF_DELIVERY_DELAY) : 0;
         [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal onNotificationReceived sendReceiveReceipt with delay: %i", randomDelay]];