Skip to content

Commit e772819

Browse files
author
Rodrigo Gomez Palacio
committed
fixup! Update executors to set offsets on consistency manager
1 parent a983c0c commit e772819

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSPropertyOperationExecutor.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,13 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
258258
if let onesignalId = request.identityModel.onesignalId {
259259
if let rywToken = response?["ryw_token"] as? String
260260
{
261-
OSConsistencyManager.shared.setRywToken(id: onesignalId, key: OSIamFetchOffsetKey.userUpdate, value: rywToken)
261+
let rywDelay = response?["ryw_delay"] as? NSNumber
262+
263+
OSConsistencyManager.shared.setRywTokenAndDelay(
264+
id: onesignalId,
265+
key: OSIamFetchOffsetKey.userUpdate,
266+
value: OSReadYourWriteData(rywToken: rywToken, rywDelay: rywDelay)
267+
)
262268
} else {
263269
// handle a potential regression where ryw_token is no longer returned by API
264270
OSConsistencyManager.shared.resolveConditionsWithID(id: OSIamFetchReadyCondition.CONDITIONID)

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSSubscriptionOperationExecutor.swift

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,12 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
301301
if let onesignalId = request.identityModel.onesignalId {
302302
if let rywToken = response["ryw_token"] as? String
303303
{
304-
OSConsistencyManager.shared.setRywToken(id: onesignalId, key: OSIamFetchOffsetKey.subscriptionUpdate, value: rywToken)
304+
let rywDelay = response["ryw_delay"] as? NSNumber
305+
OSConsistencyManager.shared.setRywTokenAndDelay(
306+
id: onesignalId,
307+
key: OSIamFetchOffsetKey.subscriptionUpdate,
308+
value: OSReadYourWriteData(rywToken: rywToken, rywDelay: rywDelay)
309+
)
305310
} else {
306311
// handle a potential regression where ryw_token is no longer returned by API
307312
OSConsistencyManager.shared.resolveConditionsWithID(id: OSIamFetchReadyCondition.CONDITIONID)
@@ -416,9 +421,14 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
416421
}
417422

418423
if let onesignalId = OneSignalUserManagerImpl.sharedInstance.onesignalId {
419-
if let rywToken = response?["ryw_token"] as? String
424+
if let rywToken = response?["ryw_token"] as? String
420425
{
421-
OSConsistencyManager.shared.setRywToken(id: onesignalId, key: OSIamFetchOffsetKey.subscriptionUpdate, value: rywToken)
426+
let rywDelay = response?["ryw_delay"] as? NSNumber
427+
OSConsistencyManager.shared.setRywTokenAndDelay(
428+
id: onesignalId,
429+
key: OSIamFetchOffsetKey.subscriptionUpdate,
430+
value: OSReadYourWriteData(rywToken: rywToken, rywDelay: rywDelay)
431+
)
422432
} else {
423433
// handle a potential regression where ryw_token is no longer returned by API
424434
OSConsistencyManager.shared.resolveConditionsWithID(id: OSIamFetchReadyCondition.CONDITIONID)

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSUserExecutor.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,12 @@ extension OSUserExecutor {
262262
if let onesignalId = request.identityModel.onesignalId {
263263
if let rywToken = response["ryw_token"] as? String
264264
{
265-
OSConsistencyManager.shared.setRywToken(id: onesignalId, key: OSIamFetchOffsetKey.userCreate, value: rywToken)
265+
let rywDelay = response["ryw_delay"] as? NSNumber
266+
OSConsistencyManager.shared.setRywTokenAndDelay(
267+
id: onesignalId,
268+
key: OSIamFetchOffsetKey.userCreate,
269+
value: OSReadYourWriteData(rywToken: rywToken, rywDelay: rywDelay)
270+
)
266271
} else {
267272
// handle a potential regression where ryw_token is no longer returned by API
268273
OSConsistencyManager.shared.resolveConditionsWithID(id: OSIamFetchReadyCondition.CONDITIONID)

0 commit comments

Comments
 (0)