From 0dbbb54bffb0c254ad93fbb5d924eb098ada56d0 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 2 Nov 2023 19:00:19 -0400 Subject: [PATCH 01/12] add public getTags method --- .../core/src/main/java/com/onesignal/user/IUserManager.kt | 5 +++++ .../src/main/java/com/onesignal/user/internal/UserManager.kt | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt index e9de656d0d..ad61a5de83 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt @@ -133,4 +133,9 @@ interface IUserManager { * @param keys The collection of keys, all of which will be removed from the current user. */ fun removeTags(keys: Collection) + + /** + * Return a copy of all local tags from the current user. + */ + fun getTags() : Map } diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt index dbb8add277..e4a4f69956 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt @@ -218,4 +218,8 @@ internal open class UserManager( _propertiesModel.tags.remove(it) } } + + override fun getTags(): Map { + return _propertiesModel.tags.toMap() + } } From 69d53b4436031c64e01b536df3260830b4040413 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 2 Nov 2023 19:03:27 -0400 Subject: [PATCH 02/12] add test for getTags Got rid of userManager.tags getter because it conflicts the name generated by the JVM which is also getTags --- .../onesignal/user/internal/UserManager.kt | 3 --- .../user/internal/UserManagerTests.kt | 23 +++++++++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt index e4a4f69956..0effb3c9ed 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt @@ -23,9 +23,6 @@ internal open class UserManager( val externalId: String? get() = _identityModel.externalId - val tags: Map - get() = _propertiesModel.tags - val aliases: Map get() = _identityModel.filter { it.key != IdentityModel::id.name }.toMap() diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt index b0e0953805..89d04e105d 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt @@ -107,8 +107,8 @@ class UserManagerTests : FunSpec({ UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext()) // When - val tag1 = userManager.tags["my-tag-key1"] - val tag2 = userManager.tags["my-tag-key2"] + val tag1 = propertiesModelStore.model.tags["my-tag-key1"] + val tag2 = propertiesModelStore.model.tags["my-tag-key2"] // add userManager.addTag("my-tag-key5", "my-tag-value5") @@ -135,6 +135,25 @@ class UserManagerTests : FunSpec({ propertiesModelStore.model.tags["my-tag-key3"] shouldBe null } + test("getTags returns a copy of tags") { + // Given + val mockSubscriptionManager = mockk() + val propertiesModelStore = + MockHelper.propertiesModelStore { + it.tags["my-tag-key1"] = "my-tag-value1" + } + + val userManager = + UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext()) + + // When + val allTags = userManager.getTags() + + // Then + allTags.size shouldBe propertiesModelStore.model.tags.size + allTags["my-tag-key1"] shouldBe propertiesModelStore.model.tags["my-tag-key1"] + } + test("subscriptions are backed by the subscriptions manager") { // Given val subscriptionList = SubscriptionList(listOf(), UninitializedPushSubscription()) From 4702341d519c4878aeed18d26f81419b9788f2b1 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Tue, 7 Nov 2023 13:15:26 -0500 Subject: [PATCH 03/12] Add test case for getTags should reflect any tags modification --- .../onesignal/user/internal/UserManagerTests.kt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt index 89d04e105d..fd1ea75dd8 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt @@ -6,6 +6,7 @@ import com.onesignal.user.internal.subscriptions.ISubscriptionManager import com.onesignal.user.internal.subscriptions.SubscriptionList import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe +import io.kotest.matchers.shouldNotBe import io.kotest.runner.junit4.KotestTestRunner import io.mockk.every import io.mockk.just @@ -147,11 +148,18 @@ class UserManagerTests : FunSpec({ UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext()) // When - val allTags = userManager.getTags() + val tagSnapshot1 = userManager.getTags() // Then - allTags.size shouldBe propertiesModelStore.model.tags.size - allTags["my-tag-key1"] shouldBe propertiesModelStore.model.tags["my-tag-key1"] + tagSnapshot1.size shouldBe propertiesModelStore.model.tags.size + tagSnapshot1["my-tag-key1"] shouldBe propertiesModelStore.model.tags["my-tag-key1"] + + // Modify + userManager.addTag("my-tag-key2", "my-tag-value2") + userManager.getTags().size shouldBe 2 + + // Then + tagSnapshot1.size shouldNotBe userManager.getTags().size } test("subscriptions are backed by the subscriptions manager") { From 2cdc61f4c33858d7a45413ddc5a40bd5428ede42 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 16 Nov 2023 01:58:48 -0500 Subject: [PATCH 04/12] Move UserState and related classes into the user directory --- .../java/com/onesignal/user/IUserManager.kt | 11 +++++++ .../com/onesignal/user/IUserStateObserver.kt | 15 ++++++++++ .../com/onesignal/user/UserChangedState.kt | 16 ++++++++++ .../main/java/com/onesignal/user/UserState.kt | 30 +++++++++++++++++++ .../onesignal/user/internal/UserManager.kt | 8 +++++ .../notifications/consumer-rules.pro | 3 ++ 6 files changed, 83 insertions(+) create mode 100644 OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt create mode 100644 OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt create mode 100644 OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt index ad61a5de83..36d9a00b8c 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt @@ -138,4 +138,15 @@ interface IUserManager { * Return a copy of all local tags from the current user. */ fun getTags() : Map + + /** + * Add an observer to the user state, allowing the provider to be + * notified whenever the user state has changed. + */ + fun addObserver(observer: IUserStateObserver) + + /** + * Remove an observer from the user state. + */ + fun removeObserver(observer: IUserStateObserver) } diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt new file mode 100644 index 0000000000..30d905a12a --- /dev/null +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt @@ -0,0 +1,15 @@ +package com.onesignal.user + +/** + * A user state changed handler. Implement this interface and provide the implementation + * to be notified when the user has changed. + */ +interface IUserStateObserver { + /** + * Called when the user state this change handler was added to, has changed. A + * user state can change when user has logged in or out + * + * @param state The user changed state. + */ + fun onUserStateChange(state: UserChangedState) +} \ No newline at end of file diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt new file mode 100644 index 0000000000..73eea8a50c --- /dev/null +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt @@ -0,0 +1,16 @@ +package com.onesignal.user + +import org.json.JSONObject + +class UserChangedState( + val previous: UserState, + val current: UserState, + val switchedUsers: Boolean, +) { + fun toJSONObject(): JSONObject { + return JSONObject() + .put("previous", previous.toJSONObject()) + .put("current", current.toJSONObject()) + .put("switchedUsers", switchedUsers) + } +} \ No newline at end of file diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt new file mode 100644 index 0000000000..a73c0e2b6c --- /dev/null +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt @@ -0,0 +1,30 @@ +package com.onesignal.user + +import org.json.JSONObject + +/** + * A user state. + */ +class UserState ( + /** + * The unique identifier for OneSignal account. This will be a null string until + * the user has been successfully logged in on the backend and assigned an ID. + * Use [addObserver] to be notified when the [onesignalId] has been successfully + * assigned. + */ + val onesignalId: String?, + + /** + * The unique external identifier. This will be a null string until the id has + * been successfully assigned and retrieved from the server. + * Use [addObserver] to be notified when the [externalId] has been successfully + * assigned. + */ + val externalId: String?, +) { + fun toJSONObject(): JSONObject { + return JSONObject() + .put("onesignalId", onesignalId) + .put("externalId", externalId) + } +} \ No newline at end of file diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt index 0effb3c9ed..6177788b9c 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt @@ -1,10 +1,12 @@ package com.onesignal.user.internal import com.onesignal.common.OneSignalUtils +import com.onesignal.common.events.EventProducer import com.onesignal.core.internal.language.ILanguageContext import com.onesignal.debug.LogLevel import com.onesignal.debug.internal.logging.Logging import com.onesignal.user.IUserManager +import com.onesignal.user.IUserStateObserver import com.onesignal.user.internal.backend.IdentityConstants import com.onesignal.user.internal.identity.IdentityModel import com.onesignal.user.internal.identity.IdentityModelStore @@ -29,6 +31,8 @@ internal open class UserManager( val subscriptions: SubscriptionList get() = _subscriptionManager.subscriptions + val changeHandlersNotifier = EventProducer() + override val pushSubscription: IPushSubscription get() = _subscriptionManager.subscriptions.push @@ -219,4 +223,8 @@ internal open class UserManager( override fun getTags(): Map { return _propertiesModel.tags.toMap() } + + override fun addObserver(observer: IUserStateObserver) = changeHandlersNotifier.subscribe(observer) + + override fun removeObserver(observer: IUserStateObserver) = changeHandlersNotifier.unsubscribe(observer) } diff --git a/OneSignalSDK/onesignal/notifications/consumer-rules.pro b/OneSignalSDK/onesignal/notifications/consumer-rules.pro index d9fc948356..d5cefdef4b 100644 --- a/OneSignalSDK/onesignal/notifications/consumer-rules.pro +++ b/OneSignalSDK/onesignal/notifications/consumer-rules.pro @@ -20,6 +20,9 @@ void onPushSubscriptionChange(com.onesignal.user.subscriptions.PushSubscriptionChangedState); } +-keep class ** implements com.onesignal.user.IUserStateObserver { + void onUserChange(com.onesignal.user.UserChangedState); +} -keep class ** implements com.onesignal.notifications.INotificationServiceExtension{ void onNotificationReceived(com.onesignal.notifications.INotificationReceivedEvent); } From 1983626a5b1aa76302662c3da787392a1da86304 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 16 Nov 2023 02:00:11 -0500 Subject: [PATCH 05/12] Revert "Move UserState and related classes into the user directory" This reverts commit 2cdc61f4c33858d7a45413ddc5a40bd5428ede42. --- .../java/com/onesignal/user/IUserManager.kt | 11 ------- .../com/onesignal/user/IUserStateObserver.kt | 15 ---------- .../com/onesignal/user/UserChangedState.kt | 16 ---------- .../main/java/com/onesignal/user/UserState.kt | 30 ------------------- .../onesignal/user/internal/UserManager.kt | 8 ----- .../notifications/consumer-rules.pro | 3 -- 6 files changed, 83 deletions(-) delete mode 100644 OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt delete mode 100644 OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt delete mode 100644 OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt index 36d9a00b8c..ad61a5de83 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt @@ -138,15 +138,4 @@ interface IUserManager { * Return a copy of all local tags from the current user. */ fun getTags() : Map - - /** - * Add an observer to the user state, allowing the provider to be - * notified whenever the user state has changed. - */ - fun addObserver(observer: IUserStateObserver) - - /** - * Remove an observer from the user state. - */ - fun removeObserver(observer: IUserStateObserver) } diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt deleted file mode 100644 index 30d905a12a..0000000000 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserStateObserver.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.onesignal.user - -/** - * A user state changed handler. Implement this interface and provide the implementation - * to be notified when the user has changed. - */ -interface IUserStateObserver { - /** - * Called when the user state this change handler was added to, has changed. A - * user state can change when user has logged in or out - * - * @param state The user changed state. - */ - fun onUserStateChange(state: UserChangedState) -} \ No newline at end of file diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt deleted file mode 100644 index 73eea8a50c..0000000000 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserChangedState.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.onesignal.user - -import org.json.JSONObject - -class UserChangedState( - val previous: UserState, - val current: UserState, - val switchedUsers: Boolean, -) { - fun toJSONObject(): JSONObject { - return JSONObject() - .put("previous", previous.toJSONObject()) - .put("current", current.toJSONObject()) - .put("switchedUsers", switchedUsers) - } -} \ No newline at end of file diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt deleted file mode 100644 index a73c0e2b6c..0000000000 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/UserState.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.onesignal.user - -import org.json.JSONObject - -/** - * A user state. - */ -class UserState ( - /** - * The unique identifier for OneSignal account. This will be a null string until - * the user has been successfully logged in on the backend and assigned an ID. - * Use [addObserver] to be notified when the [onesignalId] has been successfully - * assigned. - */ - val onesignalId: String?, - - /** - * The unique external identifier. This will be a null string until the id has - * been successfully assigned and retrieved from the server. - * Use [addObserver] to be notified when the [externalId] has been successfully - * assigned. - */ - val externalId: String?, -) { - fun toJSONObject(): JSONObject { - return JSONObject() - .put("onesignalId", onesignalId) - .put("externalId", externalId) - } -} \ No newline at end of file diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt index 6177788b9c..0effb3c9ed 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/UserManager.kt @@ -1,12 +1,10 @@ package com.onesignal.user.internal import com.onesignal.common.OneSignalUtils -import com.onesignal.common.events.EventProducer import com.onesignal.core.internal.language.ILanguageContext import com.onesignal.debug.LogLevel import com.onesignal.debug.internal.logging.Logging import com.onesignal.user.IUserManager -import com.onesignal.user.IUserStateObserver import com.onesignal.user.internal.backend.IdentityConstants import com.onesignal.user.internal.identity.IdentityModel import com.onesignal.user.internal.identity.IdentityModelStore @@ -31,8 +29,6 @@ internal open class UserManager( val subscriptions: SubscriptionList get() = _subscriptionManager.subscriptions - val changeHandlersNotifier = EventProducer() - override val pushSubscription: IPushSubscription get() = _subscriptionManager.subscriptions.push @@ -223,8 +219,4 @@ internal open class UserManager( override fun getTags(): Map { return _propertiesModel.tags.toMap() } - - override fun addObserver(observer: IUserStateObserver) = changeHandlersNotifier.subscribe(observer) - - override fun removeObserver(observer: IUserStateObserver) = changeHandlersNotifier.unsubscribe(observer) } diff --git a/OneSignalSDK/onesignal/notifications/consumer-rules.pro b/OneSignalSDK/onesignal/notifications/consumer-rules.pro index d5cefdef4b..d9fc948356 100644 --- a/OneSignalSDK/onesignal/notifications/consumer-rules.pro +++ b/OneSignalSDK/onesignal/notifications/consumer-rules.pro @@ -20,9 +20,6 @@ void onPushSubscriptionChange(com.onesignal.user.subscriptions.PushSubscriptionChangedState); } --keep class ** implements com.onesignal.user.IUserStateObserver { - void onUserChange(com.onesignal.user.UserChangedState); -} -keep class ** implements com.onesignal.notifications.INotificationServiceExtension{ void onNotificationReceived(com.onesignal.notifications.INotificationReceivedEvent); } From aa4d1c6e509095fd7c3f6c7a36e0947c34534eee Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 16 Nov 2023 02:15:17 -0500 Subject: [PATCH 06/12] Update the Migration Guide to include getTags --- MIGRATION_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md index 5498f33ed3..6414f29a10 100644 --- a/MIGRATION_GUIDE.md +++ b/MIGRATION_GUIDE.md @@ -271,7 +271,7 @@ The user name space is accessible via `OneSignal.User` (in Kotlin) or `OneSignal | `fun addTags(tags: Map)` | `void addTags(Map tags)` | *Add multiple tags for the current user. Tags are key:value pairs used as building blocks for targeting specific users and/or personalizing messages. If the tag key already exists, it will be replaced with the value provided here.* | | `fun removeTag(key: String)` | `void removeTag(String key)` | *Remove the data tag with the provided key from the current user.* | | `fun removeTags(keys: Collection)` | `void removeTags(Collection keys)` | *Remove multiple tags from the current user.* | - +| `fun getTags()` | `Map getTags()` | *Return a copy of all local tags from the current user.* **Session Namespace** The session namespace is accessible via `OneSignal.Session` (in Kotlin) or `OneSignal.getSession()` (in Java) and provides access to session-scoped functionality. From 1874bb16d31f6be46f79163140d65af27fdea149 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 16 Nov 2023 02:22:55 -0500 Subject: [PATCH 07/12] Fix the indentationError caught by lint --- .../java/com/onesignal/user/internal/UserManagerTests.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt index fd1ea75dd8..d599c5fc7e 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt @@ -139,13 +139,10 @@ class UserManagerTests : FunSpec({ test("getTags returns a copy of tags") { // Given val mockSubscriptionManager = mockk() - val propertiesModelStore = - MockHelper.propertiesModelStore { - it.tags["my-tag-key1"] = "my-tag-value1" - } + val propertiesModelStore = MockHelper.propertiesModelStore { + it.tags["my-tag-key1"] = "my-tag-value1" } - val userManager = - UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext()) + val userManager = UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext()) // When val tagSnapshot1 = userManager.getTags() From a735deeecd87c027ee7a51ab4dc1dde89a0e47e6 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 16 Nov 2023 02:27:18 -0500 Subject: [PATCH 08/12] Another attempt to fix the lint problem --- .../test/java/com/onesignal/user/internal/UserManagerTests.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt index d599c5fc7e..36d93d78b1 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt @@ -139,8 +139,7 @@ class UserManagerTests : FunSpec({ test("getTags returns a copy of tags") { // Given val mockSubscriptionManager = mockk() - val propertiesModelStore = MockHelper.propertiesModelStore { - it.tags["my-tag-key1"] = "my-tag-value1" } + val propertiesModelStore = MockHelper.propertiesModelStore { it.tags["my-tag-key1"] = "my-tag-value1" } val userManager = UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext()) From c01861d200afa2316511da4801d8aae17feedd03 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 16 Nov 2023 02:31:10 -0500 Subject: [PATCH 09/12] Fix lint issue --- .../test/java/com/onesignal/user/internal/UserManagerTests.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt index 36d93d78b1..31fa1a6248 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt @@ -139,7 +139,9 @@ class UserManagerTests : FunSpec({ test("getTags returns a copy of tags") { // Given val mockSubscriptionManager = mockk() - val propertiesModelStore = MockHelper.propertiesModelStore { it.tags["my-tag-key1"] = "my-tag-value1" } + val propertiesModelStore = MockHelper.propertiesModelStore { + it.tags["my-tag-key1"] = "my-tag-value1" + } val userManager = UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext()) From b944a41ae6ee4e8eecc42c7c0f2924671cc65a20 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 16 Nov 2023 02:35:42 -0500 Subject: [PATCH 10/12] Remove white space --- .../core/src/main/java/com/onesignal/user/IUserManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt index ad61a5de83..cdb4cdd75b 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt @@ -137,5 +137,5 @@ interface IUserManager { /** * Return a copy of all local tags from the current user. */ - fun getTags() : Map + fun getTags():Map } From 9051c34ef101ce50ba40db48fabd688f6956e671 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 16 Nov 2023 02:39:29 -0500 Subject: [PATCH 11/12] Fix lint issue --- .../java/com/onesignal/user/internal/UserManagerTests.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt index 31fa1a6248..504d397dea 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt @@ -139,9 +139,10 @@ class UserManagerTests : FunSpec({ test("getTags returns a copy of tags") { // Given val mockSubscriptionManager = mockk() - val propertiesModelStore = MockHelper.propertiesModelStore { - it.tags["my-tag-key1"] = "my-tag-value1" - } + val propertiesModelStore = + MockHelper.propertiesModelStore { + it.tags["my-tag-key1"] = "my-tag-value1" + } val userManager = UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), propertiesModelStore, MockHelper.languageContext()) From 34739246f6d532e6f33ce11785fc53eaabee43e0 Mon Sep 17 00:00:00 2001 From: jinliu9508 Date: Thu, 16 Nov 2023 02:42:02 -0500 Subject: [PATCH 12/12] Add space --- .../core/src/main/java/com/onesignal/user/IUserManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt index cdb4cdd75b..b3e2bc3864 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/IUserManager.kt @@ -137,5 +137,5 @@ interface IUserManager { /** * Return a copy of all local tags from the current user. */ - fun getTags():Map + fun getTags(): Map }