Skip to content

Commit 79001c2

Browse files
committed
update OneSignalIdentifiers to read from resilient storage
1 parent 8fb4a0a commit 79001c2

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OneSignalIdentifiers.swift

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,22 @@ public final class OneSignalIdentifiers: NSObject {
4747
set { lock.withLock { _currentAppId = newValue } }
4848
}
4949

50-
/// Last-known persisted `app_id` from shared UserDefaults. Returns nil if absent.
50+
/// Persisted `app_id` from shared UserDefaults first, then the unencrypted `OSResilientStorage` mirror,
51+
/// covering the prewarm-before-first-unlock window where UserDefaults is locked and silently returns nil.
5152
@objc public static var storedAppId: String? {
52-
return OneSignalUserDefaults.initShared().getSavedString(forKey: OSUD_APP_ID, defaultValue: nil)
53+
if let fromUD = OneSignalUserDefaults.initShared().getSavedString(forKey: OSUD_APP_ID, defaultValue: nil),
54+
!fromUD.isEmpty {
55+
return fromUD
56+
}
57+
return OSResilientStorage.string(forKey: OSResilientStorage.keyAppId)
5358
}
5459

55-
/// Persisted push `subscription_id` from shared UserDefaults. Returns nil if absent.
60+
/// Persisted push `subscription_id` from shared UserDefaults first, then the unencrypted `OSResilientStorage` mirror.
5661
@objc public static var subscriptionId: String? {
57-
return OneSignalUserDefaults.initShared().getSavedString(forKey: OSUD_PUSH_SUBSCRIPTION_ID, defaultValue: nil)
62+
if let fromUD = OneSignalUserDefaults.initShared().getSavedString(forKey: OSUD_PUSH_SUBSCRIPTION_ID, defaultValue: nil),
63+
!fromUD.isEmpty {
64+
return fromUD
65+
}
66+
return OSResilientStorage.string(forKey: OSResilientStorage.keySubscriptionId)
5867
}
5968
}

0 commit comments

Comments
 (0)