fix(core-websdk/cloud_config): fix null value

set defaultValue for null value to avoid NullPointerException fix: https://console.firebase.google.com/u/0/project/upgradeall-zero/crashlytics/app/android:net.xzos.upgradeAll/issues/a3bc73aec8e3f981f5f04f6bedd410a2?time=last-seven-days&sessionEventKey=62F4C94200B40001416BB6EDC45A652A_1708991177707791892 maybe fix: #242
DUpdateSystem · Aug 12, 2022 · 8096e27 · 8096e27
1 parent fd949d6
commit 8096e27
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.../main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/cloud_config/migration/App.kt b/.../main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/cloud_config/migration/App.kt
@@ -11,21 +11,21 @@ fun app1to2(oldJson: JSONObject): JSONObject? {
         else -> s.lowercase()
     }
 
-    if (oldJson.getInt("base_version") != 1) return null
+    if (oldJson.optInt("base_version") != 1) return null
     val targetCheckerJson = oldJson.getJSONObject("app_config")
         .getJSONObject("target_checker")
     val map = mapOf(
         "base_version" to 2,
-        "config_version" to oldJson.getJSONObject("info").getString("config_version"),
-        "uuid" to oldJson.getString("uuid"),
+        "config_version" to oldJson.getJSONObject("info").optInt("config_version"),
+        "uuid" to oldJson.optString("uuid"),
         "base_hub_uuid" to oldJson.getJSONObject("app_config")
             .getJSONObject("hub_info")
-            .getString("hub_uuid"),
+            .optString("hub_uuid"),
         "info" to mapOf(
-            "name" to oldJson.getJSONObject("info").getString("app_name"),
-            "url" to oldJson.getJSONObject("info").getString("url"),
+            "name" to oldJson.getJSONObject("info").optString("app_name"),
+            "url" to oldJson.getJSONObject("info").optString("url"),
             "extra_map" to mapOf(
-                apiConvert(targetCheckerJson.getString("api")) to targetCheckerJson.getString("extra_string")
+                apiConvert(targetCheckerJson.getString("api")) to targetCheckerJson.optString("extra_string")
             )
         ),
     )

diff --git a/.../main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/cloud_config/migration/Hub.kt b/.../main/java/net/xzos/upgradeall/core/websdk/api/client_proxy/cloud_config/migration/Hub.kt
@@ -7,19 +7,19 @@ fun hub5to6(oldJson: JSONObject): JSONObject? {
         "1c010cc9-cff8-4461-8993-a86cd190d377",
         "6a6d590b-1809-41bf-8ce3-7e3f6c8da945",
     )
-    if (oldJson.getInt("base_version") != 5) return null
-    val uuid = oldJson.getString("uuid")
+    if (oldJson.optInt("base_version") != 5) return null
+    val uuid = oldJson.optString("uuid")
     val map = mapOf(
         "base_version" to 6,
-        "config_version" to oldJson.getJSONObject("info").getString("config_version"),
+        "config_version" to oldJson.getJSONObject("info").optString("config_version"),
         "uuid" to uuid,
         "info" to mapOf(
-            "hub_name" to oldJson.getJSONObject("info").getString("hub_name"),
+            "hub_name" to oldJson.getJSONObject("info").optString("hub_name"),
             "hub_icon_url" to "",
         ),
         "target_check_api" to if (uuid in versionCodeHubs) "index" else "version_number",
-        "api_keywords" to oldJson.getJSONArray("api_keywords"),
-        "app_url_templates" to oldJson.getJSONArray("app_url_templates"),
+        "api_keywords" to oldJson.optJSONArray("api_keywords"),
+        "app_url_templates" to oldJson.optJSONArray("app_url_templates"),
     )
     return JSONObject(map)
 }