sync: smoother json (fixes #4981) (#4983)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Jan 17, 2025 · 971385e · 971385e
1 parent b32cc6f
commit 971385e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2213
-        versionName "0.22.13"
+        versionCode 2214
+        versionName "0.22.14"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/utilities/JsonUtils.kt b/app/src/main/java/org/ole/planet/myplanet/utilities/JsonUtils.kt
@@ -92,7 +92,7 @@ object JsonUtils {
         return try {
             if (jsonObject?.has(fieldName) == true) {
                 val el: JsonElement = jsonObject.get(fieldName)
-                if (el is JsonNull) 0 else el.asInt
+                if (el is JsonNull || el.asString.isEmpty()) 0 else el.asInt
             } else {
                 0
             }
@@ -107,7 +107,7 @@ object JsonUtils {
         return try {
             if (jsonObject?.has(fieldName) == true) {
                 val el: JsonElement = jsonObject.get(fieldName)
-                if (el is JsonNull) 0f else el.asFloat
+                if (el is JsonNull || el.asString.isEmpty()) 0f else el.asFloat
             } else {
                 getInt(fieldName, jsonObject).toFloat()
             }