Skip to content

Commit d5786ea

Browse files
committed
route LA requests through OneSignalIdentifiers.subscriptionId
LA request prepareForExecution was reading _user?.pushSubscriptionModel, which is nil during prewarm (predicate gates start()). Switch all 6 LA request types to OneSignalIdentifiers.subscriptionId so they read from persisted UD (with OSResilientStorage fallback for locked-storage cases).
1 parent 0aae83d commit d5786ea

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

iOS_SDK/OneSignalSDK/OneSignalLiveActivities/Source/Requests/OSRequestLiveActivityClicked.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class OSRequestLiveActivityClicked: OneSignalRequest, OSLiveActivityRequest {
4545
return false
4646
}
4747

48-
guard let subscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId else {
48+
guard let subscriptionId = OneSignalIdentifiers.subscriptionId else {
4949
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the OSRequestLiveActivityClicked due to null subscription ID.")
5050
return false
5151
}

iOS_SDK/OneSignalSDK/OneSignalLiveActivities/Source/Requests/OSRequestLiveActivityReceiveReceipts.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class OSRequestLiveActivityReceiveReceipts: OneSignalRequest, OSLiveActivityRequ
4444
return false
4545
}
4646

47-
guard let subscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId else {
47+
guard let subscriptionId = OneSignalIdentifiers.subscriptionId else {
4848
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the OSRequestLiveActivityReceiveReceipts due to null subscription ID.")
4949
return false
5050
}

iOS_SDK/OneSignalSDK/OneSignalLiveActivities/Source/Requests/OSRequestRemoveStartToken.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class OSRequestRemoveStartToken: OneSignalRequest, OSLiveActivityRequest, OSLive
4242
return false
4343
}
4444

45-
guard let subscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId else {
45+
guard let subscriptionId = OneSignalIdentifiers.subscriptionId else {
4646
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the remove start token request due to null subscription ID.")
4747
return false
4848
}

iOS_SDK/OneSignalSDK/OneSignalLiveActivities/Source/Requests/OSRequestRemoveUpdateToken.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class OSRequestRemoveUpdateToken: OneSignalRequest, OSLiveActivityRequest, OSLiv
4242
return false
4343
}
4444

45-
guard let subscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId else {
45+
guard let subscriptionId = OneSignalIdentifiers.subscriptionId else {
4646
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the remove update token request due to null subscription ID.")
4747
return false
4848
}

iOS_SDK/OneSignalSDK/OneSignalLiveActivities/Source/Requests/OSRequestSetStartToken.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class OSRequestSetStartToken: OneSignalRequest, OSLiveActivityRequest, OSLiveAct
4343
return false
4444
}
4545

46-
guard let subscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId else {
46+
guard let subscriptionId = OneSignalIdentifiers.subscriptionId else {
4747
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the set start token request due to null subscription ID.")
4848
return false
4949
}

iOS_SDK/OneSignalSDK/OneSignalLiveActivities/Source/Requests/OSRequestSetUpdateToken.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class OSRequestSetUpdateToken: OneSignalRequest, OSLiveActivityRequest, OSLiveAc
4343
return false
4444
}
4545

46-
guard let subscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId else {
46+
guard let subscriptionId = OneSignalIdentifiers.subscriptionId else {
4747
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the set update token request due to null subscription ID.")
4848
return false
4949
}

0 commit comments

Comments
 (0)