Fix JSON parsing code

Author: ospfranco

OpacityCore/src/main/jni/include/opacity.h

@@ -70,6 +70,8 @@ extern void ios_close_webview(void);
 
 extern const char *ios_get_browser_cookies_for_current_url(void);
 
+extern const char *ios_get_browser_cookies_for_domain(const char *domain);
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif  // __cplusplus

OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/OpacityCore.kt

@@ -10,6 +10,7 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.boolean
@@ -96,8 +97,18 @@ object OpacityCore {
         LocalBroadcastManager.getInstance(appContext).sendBroadcast(closeIntent)
     }
 
-    private fun parseJsonElementToAny(jsonElement: JsonElement): Any {
+    private fun parseJsonElementToAny(jsonElement: JsonElement): Any? {
         return when (jsonElement) {
+            is JsonObject -> {
+                jsonElement.toMap().mapValues { parseJsonElementToAny(it.value) }
+            }
+
+            is JsonArray -> {
+                jsonElement.map { parseJsonElementToAny(it) }
+            }
+
+            is JsonNull -> null
+
             is JsonPrimitive -> {
                 when {
                     jsonElement.isString -> jsonElement.content
@@ -108,28 +119,20 @@ object OpacityCore {
                 }
             }
 
-            is JsonObject -> {
-                jsonElement.toMap().mapValues { parseJsonElementToAny(it.value) }
-            }
-
-            is JsonArray -> {
-                jsonElement.map { parseJsonElementToAny(it) }
-            }
-
             else -> throw Exception("Could not convert JSON primitive $jsonElement")
         }
     }
 
     @JvmStatic
-    suspend fun get(name: String, params: Map<String, Any?>?): Map<String, Any> {
+    suspend fun get(name: String, params: Map<String, Any?>?): Map<String, Any?> {
         return withContext(Dispatchers.IO) {
             val paramsString = params?.let { Json.encodeToString(it) }
             val res = getNative(name, paramsString)
             if (res.status != 0) {
                 throw Exception(res.err)
             }
 
-            val map: Map<String, Any> =
+            val map: Map<String, Any?> =
                 Json.parseToJsonElement(res.data!!).jsonObject.mapValues {
                     parseJsonElementToAny(it.value)
                 }

app/src/main/java/com/opacitylabs/opacitycoreexample/MainActivity.kt

@@ -50,20 +50,7 @@ class MainActivity : ComponentActivity() {
                     containerColor = androidx.compose.ui.graphics.Color.Black
                 ) { innerPadding ->
                     Column(modifier = Modifier.padding(innerPadding)) {
-                        val flowInput = remember { mutableStateOf("") }
-
-                        Button(
-                            onClick = {
-                                lifecycleScope.launch {
-                                    try {
-                                        val res = OpacityCore.get("uber_rider:profile", null)
-                                        Log.d("MainActivity", res["json"].toString())
-                                    } catch (e: Exception) {
-                                        Log.e("MainActivity", e.toString())
-                                    }
-                                }
-                            },
-                        ) { Text(text = "Uber Rider Profile") }
+                        val flowInput = remember { mutableStateOf("github:profile") }
 
                         TextField(
                             value = flowInput.value,
@@ -76,7 +63,8 @@ class MainActivity : ComponentActivity() {
                                 lifecycleScope.launch {
                                     try {
                                         val res = OpacityCore.get(flowInput.value, null)
-                                        Log.d("MainActivity", res["json"].toString())
+                                        Log.d("MainActivity", "🟩🟩🟩")
+                                        Log.d("MainActivity", res.toString())
                                     } catch (e: Exception) {
                                         Log.e("MainActivity", e.toString())
                                     }
@@ -127,6 +115,6 @@ class MainActivity : ComponentActivity() {
         requireNotNull(opacityApiKey) { "Opacity API key is null" }
 
         OpacityCore.setContext(this)
-        OpacityCore.initialize(opacityApiKey, false, OpacityCore.Environment.PRODUCTION, true)
+        OpacityCore.initialize(opacityApiKey, false, OpacityCore.Environment.STAGING, true)
     }
 }