Skip to content

Commit 6f3a48f

Browse files
author
Rodrigo Gomez Palacio
committed
Nit: rename method for clarity
Motivation: it's unclear from the previous method name that we are expecting something to be returned.
1 parent 938e7c8 commit 6f3a48f

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

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
@@ -44,7 +44,7 @@ class ConsistencyManager : IConsistencyManager {
4444
/**
4545
* Register a condition with its corresponding deferred action. Returns a deferred condition.
4646
*/
47-
override suspend fun registerCondition(condition: ICondition): CompletableDeferred<String?> {
47+
override suspend fun getRywDataFromAwaitableCondition(condition: ICondition): CompletableDeferred<RywData?> {
4848
mutex.withLock {
4949
val deferred = CompletableDeferred<String?>()
5050
val pair = Pair(condition, deferred)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ interface IConsistencyManager {
2222
* condition: ICondition - the condition to be registered
2323
* Returns: CompletableDeferred<String?> - a deferred action that completes when the condition is met
2424
*/
25-
suspend fun registerCondition(condition: ICondition): CompletableDeferred<String?>
25+
suspend fun getRywDataFromAwaitableCondition(condition: ICondition): CompletableDeferred<String?>
2626

2727
/**
2828
* Resolve all conditions with a specific ID

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ConsistencyManagerTests : FunSpec({
2525
consistencyManager.setRywToken(id, key, value)
2626

2727
val condition = TestMetCondition(mapOf(id to mapOf(key to value)))
28-
val deferred = consistencyManager.registerCondition(condition)
28+
val deferred = consistencyManager.getRywDataFromAwaitableCondition(condition)
2929
val result = deferred.await()
3030

3131
result shouldBe value
@@ -43,7 +43,7 @@ class ConsistencyManagerTests : FunSpec({
4343
consistencyManager.setRywToken(id, key, value)
4444

4545
val condition = TestMetCondition(mapOf(id to mapOf(key to value)))
46-
val deferred = consistencyManager.registerCondition(condition)
46+
val deferred = consistencyManager.getRywDataFromAwaitableCondition(condition)
4747

4848
deferred.await()
4949
deferred.isCompleted shouldBe true
@@ -53,7 +53,7 @@ class ConsistencyManagerTests : FunSpec({
5353
test("registerCondition does not complete when condition is not met") {
5454
runTest {
5555
val condition = TestUnmetCondition()
56-
val deferred = consistencyManager.registerCondition(condition)
56+
val deferred = consistencyManager.getRywDataFromAwaitableCondition(condition)
5757

5858
consistencyManager.setRywToken("id", IamFetchRywTokenKey.USER, "123")
5959
deferred.isCompleted shouldBe false
@@ -63,7 +63,7 @@ class ConsistencyManagerTests : FunSpec({
6363
test("resolveConditionsWithID resolves conditions based on ID") {
6464
runTest {
6565
val condition = TestUnmetCondition()
66-
val deferred = consistencyManager.registerCondition(condition)
66+
val deferred = consistencyManager.getRywDataFromAwaitableCondition(condition)
6767
consistencyManager.resolveConditionsWithID(TestUnmetCondition.ID)
6868
deferred.await()
6969

OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ internal class InAppMessagesManager(
164164
// attempt to fetch messages from the backend (if we have the pre-requisite data already)
165165
val onesignalId = _userManager.onesignalId
166166
val updateConditionDeferred =
167-
_consistencyManager.registerCondition(IamFetchReadyCondition(onesignalId))
167+
_consistencyManager.getRywDataFromAwaitableCondition(IamFetchReadyCondition(onesignalId))
168168
val rywToken = updateConditionDeferred.await()
169169
if (rywToken != null) {
170170
fetchMessages(rywToken)
@@ -241,7 +241,7 @@ internal class InAppMessagesManager(
241241
suspendifyOnThread {
242242
val onesignalId = _userManager.onesignalId
243243
val iamFetchCondition =
244-
_consistencyManager.registerCondition(IamFetchReadyCondition(onesignalId))
244+
_consistencyManager.getRywDataFromAwaitableCondition(IamFetchReadyCondition(onesignalId))
245245
val rywToken = iamFetchCondition.await()
246246

247247
if (rywToken != null) {

0 commit comments

Comments
 (0)