Catch any parsing errors when formatting the value

woocommerce · Sep 27, 2024 · b585623 · b585623
1 parent 1563eca
commit b585623
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/...mmerce/src/main/kotlin/com/woocommerce/android/ui/customfields/list/CustomFieldsScreen.kt b/...mmerce/src/main/kotlin/com/woocommerce/android/ui/customfields/list/CustomFieldsScreen.kt
@@ -267,11 +267,13 @@ private fun JsonCustomFieldViewer(
             shape = MaterialTheme.shapes.medium,
         ) {
             val jsonFormatted = remember(customField.value) {
-                if (customField.value.trimStart().startsWith("[")) {
-                    JSONArray(customField.value).toString(4)
-                } else {
-                    JSONObject(customField.value).toString(4)
-                }
+                runCatching {
+                    if (customField.value.trimStart().startsWith("[")) {
+                        JSONArray(customField.value).toString(4)
+                    } else {
+                        JSONObject(customField.value).toString(4)
+                    }
+                }.getOrDefault(customField.value)
             }
 
             Column(
@@ -347,11 +349,7 @@ private fun JsonCustomFieldViewerPreview() {
                 CustomField(
                     id = 0,
                     key = "key1",
-                    value =
-                    """|{
-                       |    "Key": "Value"
-                       |}
-                       |""".trimMargin()
+                    value = "[{\"key\": \"value\"}]"
                 )
             ),
             onDismiss = {}