-
Notifications
You must be signed in to change notification settings - Fork 263
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1470 from OneSignal/improve/delay_updates_after_c…
…reates [Fix] Handle incorrect `404`, delay making requests to new IDs
- Loading branch information
Showing
27 changed files
with
561 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,4 @@ | ||
| line_length: 150 | ||
| line_length: 150 | ||
| disabled_rules: | ||
| # Track https://github.com/realm/SwiftLint/pull/5521 | ||
| - opening_brace |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSNewRecordsState.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| Modified MIT License | ||
| Copyright 2024 OneSignal | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| 1. The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
| 2. All copies of substantial portions of the Software may only be used in connection | ||
| with services provided by OneSignal. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. | ||
| */ | ||
|
|
||
| import OneSignalCore | ||
|
|
||
| /** | ||
| * Purpose: Keeps track of IDs that were just created on the backend. | ||
| * This list gets used to delay network calls to ensure upcoming | ||
| * requests are ready to be accepted by the backend. | ||
| */ | ||
| public class OSNewRecordsState { | ||
| /** | ||
| Params: | ||
| - Key - a string ID such as onesignal ID or subscription ID | ||
| - Value - a Date timestamp of when the ID was created | ||
| */ | ||
| private var records: [String: Date] = [:] | ||
| private let lock = NSRecursiveLock() | ||
|
|
||
| public init() { } | ||
|
|
||
| /** | ||
| Only add a new record with the current timestamp if overwriting is requested, or it is not already present | ||
| */ | ||
| public func add(_ key: String, _ overwrite: Bool = false) { | ||
| lock.withLock { | ||
| if overwrite || records[key] == nil { | ||
| records[key] = Date() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public func canAccess(_ key: String) -> Bool { | ||
| lock.withLock { | ||
| guard let timeLastMovedOrCreated = records[key] else { | ||
| return true | ||
| } | ||
|
|
||
| let minimumTime = timeLastMovedOrCreated.addingTimeInterval(TimeInterval(OP_REPO_POST_CREATE_DELAY_SECONDS)) | ||
|
|
||
| return Date() >= minimumTime | ||
| } | ||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/MockNewRecordsState.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| Modified MIT License | ||
| Copyright 2024 OneSignal | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| 1. The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
| 2. All copies of substantial portions of the Software may only be used in connection | ||
| with services provided by OneSignal. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. | ||
| */ | ||
|
|
||
| @testable import OneSignalOSCore | ||
|
|
||
| public class MockNewRecordsState: OSNewRecordsState { | ||
| public struct MockNewRecord { | ||
| let key: String | ||
| let overwrite: Bool | ||
| } | ||
|
|
||
| public var records: [MockNewRecord] = [] | ||
|
|
||
| override public func add(_ key: String, _ overwrite: Bool = false) { | ||
| let record = MockNewRecord(key: key, overwrite: overwrite) | ||
| records.append(record) | ||
|
|
||
| super.add(key, overwrite) | ||
| } | ||
|
|
||
| override public func canAccess(_ key: String) -> Bool { | ||
| return super.canAccess(key) | ||
| } | ||
|
|
||
| public func get(_ key: String?) -> [MockNewRecord] { | ||
| return records.filter { $0.key == key } | ||
| } | ||
|
|
||
| public func contains(_ key: String?) -> Bool { | ||
| return get(key).count > 0 | ||
| } | ||
|
|
||
| public func wasOverwritten(_ key: String?) -> Bool { | ||
| return records.filter { $0.key == key && $0.overwrite }.count > 0 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.