chore: merge 5.3.0 beta into main and resolve conflict #2525

jinliu9508 · 2026-01-21T20:48:18Z

Rebase and resolve conflicts from main.

This change is

chore: Kotlin 1.9 update

chore(tests): add SessionListenerTests class

ci: create release prs for wrappers for new android sdk release

Co-authored-by: AR Abdul Azeez <abdul@onesignal.com>

- removed CustomEvent and immediately save custom event properties into a JSONObject - renamed TrackEventOperation to TrackCustomEventOperation - removed app_id in body - fix comparison key to unique custom event key - fix some test units to prevent them from failing

abdulraqeeb33 · 2026-01-22T17:36:04Z

.github/workflows/ci.yml

@@ -1,15 +1,11 @@
 name: Build and Test SDK

-concurrency:


i wonder why this file would get impacted @jinliu9508 ?

This is from resolving the conflict. I have updated the ci.yml with the most recent one.

abdulraqeeb33 · 2026-01-22T17:38:28Z

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONUtils.kt

+        return when (value) {
+            null,
+            is Boolean,
+            is Number,


how about finite checks?

abdulraqeeb33 · 2026-01-22T17:39:09Z

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONUtils.kt

+            is JSONObject,
+            is JSONArray,
+            -> true
+            is Map<*, *> -> value.keys.all { it is String } && value.values.all { isValidJsonObject(it) }


can you please write a unit test for this?

Added more tests for JSONUtils.kt

...ore/src/main/java/com/onesignal/user/internal/customEvents/impl/CustomEventBackendService.kt

abdulraqeeb33 · 2026-01-22T17:41:53Z

...al/core/src/main/java/com/onesignal/user/internal/customEvents/impl/CustomEventController.kt

+     * Recursively convert a JSON-serializable map into a JSON-compatible format, handling
+     * nested Maps and Lists appropriately.
+     */
+    private fun mapToJson(map: Map<String, Any>): JSONObject {


should the two methods be placed in json utils class? and we should write unit tests for these

Good suggestion. These are generic and are now moved into JSONUtils.kt

...gnal/core/src/main/java/com/onesignal/user/internal/customEvents/impl/CustomEventMetadata.kt

...n/java/com/onesignal/user/internal/operations/impl/executors/CustomEventOperationExecutor.kt

abdulraqeeb33 · 2026-01-22T17:45:50Z

...n/java/com/onesignal/user/internal/operations/impl/executors/CustomEventOperationExecutor.kt

+    }
+
+    companion object {
+        const val CUSTOM_EVENT = "custom-event"


should go the centralized constants class/interface as well

This will be done in a separate future PR.

abdulraqeeb33 · 2026-01-22T17:46:27Z

...ignal/core/src/main/java/com/onesignal/user/internal/operations/TrackCustomEventOperation.kt

+            setOptStringProperty(::eventProperties.name, value)
+        }
+
+    override val createComparisonKey: String get() = "$appId.User.$onesignalId.CustomEvent.$eventName"


both are same? is that expected?

github-actions · 2026-01-23T21:12:31Z

📊 Diff Coverage Report

Diff Coverage Report

Threshold: 80%

Changed Files Coverage

✅ JSONUtils.kt: 81/99 lines (81.8%)
❌ OperationModelStore.kt: 25/41 lines (61.0%)
- ⚠️ Below threshold: 16 uncovered lines
❌ IUserManager.kt: 0/2 lines (0.0%)
- ⚠️ Below threshold: 2 uncovered lines
⚠️ UserModule.kt: Not in coverage report (may not be compiled/tested)
❌ UserManager.kt: 80/136 lines (58.8%)
- ⚠️ Below threshold: 56 uncovered lines
✅ CustomEventBackendService.kt: 20/21 lines (95.2%)
❌ CustomEventController.kt: 0/15 lines (0.0%)
- ⚠️ Below threshold: 15 uncovered lines
✅ CustomEventMetadata.kt: 16/16 lines (100.0%)
✅ TrackCustomEventOperation.kt: 28/35 lines (80.0%)
❌ CustomEventOperationExecutor.kt: 25/32 lines (78.1%)
- ⚠️ Below threshold: 7 uncovered lines
⚠️ MockHelper.kt: Not in coverage report (may not be compiled/tested)

Overall Coverage

275/397 lines covered (69.3%)

❌ Coverage Check Failed

Files below 80% threshold:

OperationModelStore.kt: 61.0% (16 uncovered lines)
IUserManager.kt: 0.0% (2 uncovered lines)
UserManager.kt: 58.8% (56 uncovered lines)
CustomEventController.kt: 0.0% (15 uncovered lines)
CustomEventOperationExecutor.kt: 78.1% (7 uncovered lines)

📥 View workflow run

jinliu9508 requested review from abdulraqeeb33 and jkasten2 January 21, 2026 20:48

jkasten2 and others added 8 commits January 21, 2026 16:47

Merge pull request #2403 from OneSignal/kotlin1.9-update

2c50fa8

chore: Kotlin 1.9 update

Merge pull request #2389 from OneSignal/chore/add_session_listener_tests

bd3ac8b

chore(tests): add SessionListenerTests class

Merge pull request #2501 from OneSignal/fg/wrapper-prs

ca0ee23

ci: create release prs for wrappers for new android sdk release

test coverage test (#2409)

038ac65

Co-authored-by: AR Abdul Azeez <abdul@onesignal.com>

add: custom event API and internal data model

bfa2e34

add: backend service for custom events

1bc4a1f

add: unit tests for custom events

e60e157

jinliu9508 force-pushed the 5.3.0_beta_branch branch from 629ab0b to db81966 Compare January 21, 2026 21:53

jinliu9508 changed the base branch from 5.6-main to main January 21, 2026 21:53

jinliu9508 changed the title ~~chore: resolve conflict between 5.3.0_beta_branch and 5.6-main~~ chore: merge 5.3.0 beta into main and resolve conflict Jan 21, 2026

abdulraqeeb33 requested changes Jan 22, 2026

View reviewed changes

chore: update sdkVersion reference; add tests for JSONUtils

d335b1b

jinliu9508 force-pushed the 5.3.0_beta_branch branch from db81966 to d335b1b Compare January 23, 2026 20:54

jinliu9508 requested a review from abdulraqeeb33 January 23, 2026 20:57

address detekt failure

25071ca

chore: merge 5.3.0 beta into main and resolve conflict #2525

Are you sure you want to change the base?

chore: merge 5.3.0 beta into main and resolve conflict #2525

Uh oh!

Conversation

jinliu9508 commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 23, 2026

📊 Diff Coverage Report

Diff Coverage Report

Changed Files Coverage

Overall Coverage

❌ Coverage Check Failed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jinliu9508 commented Jan 21, 2026 •

edited

Loading