Skip to content

Commit d3bd67f

Browse files
author
Rodrigo Gomez Palacio
committed
Rename getNewestToken to getRywData for clarity
Motivation: we switched to return a RywData object so method name didn't make sense any more
1 parent 219acc2 commit d3bd67f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/consistency/IamFetchReadyCondition.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class IamFetchReadyCondition(
3333
return userUpdateTokenSet
3434
}
3535

36-
override fun getNewestToken(indexedTokens: Map<String, Map<IConsistencyKeyEnum, RywData?>>): RywData? {
36+
override fun getRywData(indexedTokens: Map<String, Map<IConsistencyKeyEnum, RywData?>>): RywData? {
3737
val tokenMap = indexedTokens[key] ?: return null
3838

3939
// Collect non-null RywData objects and find the one with the largest rywToken lexicographically

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/consistency/impl/ConsistencyManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class ConsistencyManager : IConsistencyManager {
7979

8080
for ((condition, deferred) in conditions) {
8181
if (condition.isMet(indexedTokens)) {
82-
val rywDataForNewestToken = condition.getNewestToken(indexedTokens)
82+
val rywDataForNewestToken = condition.getRywData(indexedTokens)
8383
if (!deferred.isCompleted) {
8484
deferred.complete(rywDataForNewestToken)
8585
}

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/consistency/models/ICondition.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ interface ICondition {
1919
* Used to process tokens according to their format & return the newest token.
2020
* e.g. numeric strings would be compared differently from JWT tokens
2121
*/
22-
fun getNewestToken(indexedTokens: Map<String, Map<IConsistencyKeyEnum, RywData?>>): RywData?
22+
fun getRywData(indexedTokens: Map<String, Map<IConsistencyKeyEnum, RywData?>>): RywData?
2323
}

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/common/consistency/ConsistencyManagerTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class ConsistencyManagerTests : FunSpec({
8989
return false // Always returns false to simulate an unmet condition
9090
}
9191

92-
override fun getNewestToken(indexedTokens: Map<String, Map<IConsistencyKeyEnum, RywData?>>): RywData? {
92+
override fun getRywData(indexedTokens: Map<String, Map<IConsistencyKeyEnum, RywData?>>): RywData? {
9393
return null
9494
}
9595
}
@@ -109,7 +109,7 @@ class ConsistencyManagerTests : FunSpec({
109109
return indexedTokens == expectedRywTokens
110110
}
111111

112-
override fun getNewestToken(indexedTokens: Map<String, Map<IConsistencyKeyEnum, RywData?>>): RywData? {
112+
override fun getRywData(indexedTokens: Map<String, Map<IConsistencyKeyEnum, RywData?>>): RywData? {
113113
return expectedRywTokens.values.firstOrNull()?.values?.firstOrNull()
114114
}
115115
}

0 commit comments

Comments
 (0)