Updated decoding of empty or null JSON data

s


s

xxclient/src/main/java/io/elixxir/xxclient/models/BindingsModel.kt

@@ -19,7 +19,7 @@ interface BindingsModel {
 
         inline fun <reified T> decode(data: ByteArray?): T? {
             return data?.run {
-                if (isNotEmpty() && decodeToString() != "null") {
+                if (isValidData()) {
                     val typeToken = object : TypeToken<T>() {}.type
                     Gson().fromJson<T>(decodeToString(), typeToken)
                 } else {
@@ -31,11 +31,15 @@ interface BindingsModel {
 
         inline fun <reified T> decodeArray(data: ByteArray?): List<T> {
             return data?.run {
-                if (isNotEmpty() && decodeToString() != "null") {
+                if (isValidData()) {
                     val typeToken = object : TypeToken<Array<T>>() {}.type
                     Gson().fromJson<Array<T>>(decodeToString(), typeToken).toList()
                 } else listOf()
             } ?: listOf()
         }
+
+        fun ByteArray.isValidData(): Boolean {
+            return isNotEmpty() && decodeToString() != "[]" && decodeToString() != "null"
+        }
     }
 }
\ No newline at end of file