Merge branch 'master' into 5037-sync-improvement-1

dogi · web-flow · commit f0b09a04f593 · 2025-01-17T14:06:20.000-05:00
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()
             }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ object JsonUtils {`
`92`	`92`	`return try {`
`93`	`93`	`if (jsonObject?.has(fieldName) == true) {`
`94`	`94`	`val el: JsonElement = jsonObject.get(fieldName)`
`95`		`- if (el is JsonNull) 0 else el.asInt`
	`95`	`+ if (el is JsonNull \|\| el.asString.isEmpty()) 0 else el.asInt`
`96`	`96`	`} else {`
`97`	`97`	`0`
`98`	`98`	`}`
`@@ -107,7 +107,7 @@ object JsonUtils {`
`107`	`107`	`return try {`
`108`	`108`	`if (jsonObject?.has(fieldName) == true) {`
`109`	`109`	`val el: JsonElement = jsonObject.get(fieldName)`
`110`		`- if (el is JsonNull) 0f else el.asFloat`
	`110`	`+ if (el is JsonNull \|\| el.asString.isEmpty()) 0f else el.asFloat`
`111`	`111`	`} else {`
`112`	`112`	`getInt(fieldName, jsonObject).toFloat()`
`113`	`113`	`}`