From f4833cf8be84c286995ceba0103a9d64be621a4d Mon Sep 17 00:00:00 2001
From: Fabrizio Bertoglio <fabrizio.bertoglio@gmail.com>
Date: Tue, 29 Jul 2025 14:53:14 +0200
Subject: [PATCH] Revert "[RN 0.82] Vendor JSONArguments to JSONToWritableMap
 (#46)"

This reverts commit 41de25caa7dd01f2513eb3616640b1475fc901a6.
---
 .../wearconnectivity/JSONToWritableMap.java   | 47 -------------------
 .../WearConnectivityMessageClient.java        |  3 +-
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 android/src/main/java/com/wearconnectivity/JSONToWritableMap.java

diff --git a/android/src/main/java/com/wearconnectivity/JSONToWritableMap.java b/android/src/main/java/com/wearconnectivity/JSONToWritableMap.java
deleted file mode 100644
index 245e118..0000000
--- a/android/src/main/java/com/wearconnectivity/JSONToWritableMap.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.wearconnectivity;
-
-import java.util.Iterator;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class JSONToWritableMap {
-    
-  /**
-   * Parse JSONObject to ReadableMap
-   *
-   * @param obj The JSONObject to be parsed
-   * @return readableMap from the JSONObject
-   */
-  public static ReadableMap fromJSONObject(JSONObject obj) throws JSONException {
-    WritableMap result = Arguments.createMap();
-    Iterator<String> keys = obj.keys();
-
-    while (keys.hasNext()) {
-      String key = keys.next();
-      Object val = obj.get(key);
-      if (val instanceof JSONObject) {
-        result.putMap(key, fromJSONObject((JSONObject) val));
-      } else if (val instanceof JSONArray) {
-        result.putArray(key, fromJSONArray((JSONArray) val));
-      } else if (val instanceof String) {
-        result.putString(key, (String) val);
-      } else if (val instanceof Boolean) {
-        result.putBoolean(key, (Boolean) val);
-      } else if (val instanceof Integer) {
-        result.putInt(key, (Integer) val);
-      } else if (val instanceof Double) {
-        result.putDouble(key, (Double) val);
-      } else if (val instanceof Long) {
-        result.putInt(key, ((Long) val).intValue());
-      } else if (obj.isNull(key)) {
-        result.putNull(key);
-      } else {
-        // Unknown value type. Will throw
-        throw new JSONException("Unexpected value when parsing JSON object. key: " + key);
-      }
-    }
-
-    return result;
-  }
-}
diff --git a/android/src/main/java/com/wearconnectivity/WearConnectivityMessageClient.java b/android/src/main/java/com/wearconnectivity/WearConnectivityMessageClient.java
index 498e1c7..9149d1d 100644
--- a/android/src/main/java/com/wearconnectivity/WearConnectivityMessageClient.java
+++ b/android/src/main/java/com/wearconnectivity/WearConnectivityMessageClient.java
@@ -11,6 +11,7 @@
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.JSONArguments;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
@@ -66,7 +67,7 @@ public void sendMessage(ReadableMap messageData, List<Node> connectedNodes, Call
     public void onMessageReceived(@NonNull MessageEvent messageEvent) {
         try {
             JSONObject jsonObject = new JSONObject(messageEvent.getPath());
-            WritableMap messageAsWritableMap = (WritableMap) JSONToWritableMap.fromJSONObject(jsonObject);
+            WritableMap messageAsWritableMap = (WritableMap) JSONArguments.fromJSONObject(jsonObject);
             String event = jsonObject.getString("event");
             FLog.w(TAG, TAG + " event: " + event + " message: " + messageAsWritableMap);
             Intent service = new Intent(reactContext, com.wearconnectivity.WearConnectivityTask.class);