xxclient/src/main/java/io/elixxir/xxclient/e2e/E2eAdapter.kt

@@ -130,7 +130,7 @@ open class E2eAdapter(protected val e2e: E2eBindings) : E2e{
             payload,
             params
         )
-        return Gson().fromJson(reportData.decodeToString(), SendReport::class.java)
+        return decode(reportData)
     }
 
     override fun registerListener(

xxclient/src/main/java/io/elixxir/xxclient/group/Group.kt

 package io.elixxir.xxclient.group
 
-import io.elixxir.xxclient.models.BindingsModel.Companion.decode
-import io.elixxir.xxclient.models.GroupMembersList
+import io.elixxir.xxclient.models.BindingsModel.Companion.decodeArray
+import io.elixxir.xxclient.models.GroupMember
 import bindings.Group as GroupBindings
 
 interface Group {
@@ -9,7 +9,7 @@ interface Group {
     val createdNano: Long
     val id: ByteArray
     val initMessage: ByteArray
-    val membership: GroupMembersList
+    val membership: List<GroupMember>
     val name: ByteArray
     val serialize: ByteArray
 }
@@ -25,8 +25,7 @@ open class GroupAdapter(
         get() = group.id
     override val initMessage: ByteArray
         get() = group.initMessage
-    override val membership: GroupMembersList
-        get() = decode(group.membership) ?: GroupMembersList(listOf())
+    override val membership: List<GroupMember> by lazy { decodeArray(group.membership) }
     override val name: ByteArray
         get() = group.name
     override val serialize: ByteArray by lazy { group.serialize() }

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

@@ -2,7 +2,6 @@ package io.elixxir.xxclient.models
 
 import android.util.Log
 import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import io.elixxir.xxclient.utils.toBase64String
 
 interface BindingsModel {
@@ -16,15 +15,13 @@ interface BindingsModel {
             val data = list.map {
                 (it as? ByteArray)?.toBase64String() ?: it
             }
-            val typeToken = object : TypeToken<Array<T>>() {}.type
-            return Gson().toJson(data.toTypedArray(), typeToken).encodeToByteArray()
+            return Gson().toJson(data.toTypedArray(), T::class.java).encodeToByteArray()
         }
 
         inline fun <reified T> decode(data: ByteArray?): T? {
             return data?.run {
                 if (isValidData()) {
-                    val typeToken = object : TypeToken<T>() {}.type
-                    Gson().fromJson<T>(decodeToString(), typeToken)
+                    Gson().fromJson(decodeToString(), T::class.java)
                 } else {
                     Log.d("Decode", "Failed to decode data: ${decodeToString()}")
                     null
@@ -35,8 +32,7 @@ interface BindingsModel {
         inline fun <reified T> decodeArray(data: ByteArray?): List<T> {
             return data?.run {
                 if (isValidData()) {
-                    val typeToken = object : TypeToken<Array<T>>() {}.type
-                    Gson().fromJson<Array<T>>(decodeToString(), typeToken).toList()
+                    Gson().fromJson(decodeToString(), Array<T>::class.java).toList()
                 } else listOf()
             } ?: listOf()
         }