Skip to content

fix: adjust parsing logic for array data for Android #1883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fadi-george merged 4 commits into from
Dec 16, 2025
Merged

fix: adjust parsing logic for array data for Android #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcde214
wip
fadi-george Dec 15, 2025
d961e5b
add fix for transforming array data
fadi-george Dec 15, 2025
b4bc082
add .env example
fadi-george Dec 15, 2025
6357242
remove example changes
fadi-george Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ coverage/

# tsc / build
#
.env
.gradle
build
dist
Expand Down
29 changes: 29 additions & 0 deletions android/src/main/java/com/onesignal/rnonesignalandroid/RNUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.ReadableMapKeySetIterator;
import com.facebook.react.bridge.ReadableType;
import com.facebook.react.bridge.WritableArray;
import com.facebook.react.bridge.WritableMap;
import com.onesignal.inAppMessages.IInAppMessage;
import com.onesignal.inAppMessages.IInAppMessageClickEvent;
Expand Down Expand Up @@ -51,6 +52,8 @@ public static WritableMap convertHashMapToWritableMap(HashMap<String, Object> ha
writableMap.putDouble(key, ((Long) value).doubleValue());
} else if (value instanceof HashMap) {
writableMap.putMap(key, convertHashMapToWritableMap((HashMap<String, Object>) value));
} else if (value instanceof List) {
writableMap.putArray(key, convertListToWritableArray((List<Object>) value));
} else {
writableMap.putNull(key);
}
Expand Down Expand Up @@ -287,4 +290,30 @@ private static List<Object> convertJSONArrayToList(JSONArray array) throws JSONE

return list;
}

private static WritableArray convertListToWritableArray(List<Object> list) throws JSONException {
WritableArray writableArray = Arguments.createArray();
for (Object item : list) {
if (item instanceof String) {
writableArray.pushString((String) item);
} else if (item instanceof Boolean) {
writableArray.pushBoolean((Boolean) item);
} else if (item instanceof Integer) {
writableArray.pushInt((Integer) item);
} else if (item instanceof Double) {
writableArray.pushDouble((Double) item);
} else if (item instanceof Float) {
writableArray.pushDouble(((Float) item).doubleValue());
} else if (item instanceof Long) {
writableArray.pushDouble(((Long) item).doubleValue());
Copy link
Copy Markdown

@abdulraqeeb33 abdulraqeeb33 Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this accurate @fadi-george ?

Copy link
Copy Markdown
Collaborator Author

@fadi-george fadi-george Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have this also in convertHashMapToWritableMap and haven't received any complaints from that.
This logic could be error prone for really large long values though but should be fine for now.

} else if (item instanceof HashMap) {
writableArray.pushMap(convertHashMapToWritableMap((HashMap<String, Object>) item));
} else if (item instanceof List) {
writableArray.pushArray(convertListToWritableArray((List<Object>) item));
} else {
writableArray.pushNull();
}
}
return writableArray;
}
}
Loading