Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
Elixxir dApps SDK Kotlin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile
android
Elixxir dApps SDK Kotlin
Commits
e0e46a0a
Commit
e0e46a0a
authored
Nov 17, 2022
by
Kamal Bramwell
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Use class instance instead of TypeToken for Gson decoding"
This reverts commit
48b19f7f
.
parent
31c75094
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
xxclient/src/main/java/io/elixxir/xxclient/models/BindingsModel.kt
+5
-2
5 additions, 2 deletions
...src/main/java/io/elixxir/xxclient/models/BindingsModel.kt
with
5 additions
and
2 deletions
xxclient/src/main/java/io/elixxir/xxclient/models/BindingsModel.kt
+
5
−
2
View file @
e0e46a0a
...
@@ -2,6 +2,7 @@ package io.elixxir.xxclient.models
...
@@ -2,6 +2,7 @@ package io.elixxir.xxclient.models
import
android.util.Log
import
android.util.Log
import
com.google.gson.Gson
import
com.google.gson.Gson
import
com.google.gson.reflect.TypeToken
import
io.elixxir.xxclient.utils.toBase64String
import
io.elixxir.xxclient.utils.toBase64String
interface
BindingsModel
{
interface
BindingsModel
{
...
@@ -21,7 +22,8 @@ interface BindingsModel {
...
@@ -21,7 +22,8 @@ interface BindingsModel {
inline
fun
<
reified
T
>
decode
(
data
:
ByteArray
?):
T
?
{
inline
fun
<
reified
T
>
decode
(
data
:
ByteArray
?):
T
?
{
return
data
?.
run
{
return
data
?.
run
{
if
(
isValidData
())
{
if
(
isValidData
())
{
Gson
().
fromJson
(
decodeToString
(),
T
::
class
.
java
)
val
typeToken
=
object
:
TypeToken
<
T
>()
{}.
type
Gson
().
fromJson
<
T
>(
decodeToString
(),
typeToken
)
}
else
{
}
else
{
Log
.
d
(
"Decode"
,
"Failed to decode data: ${decodeToString()}"
)
Log
.
d
(
"Decode"
,
"Failed to decode data: ${decodeToString()}"
)
null
null
...
@@ -32,7 +34,8 @@ interface BindingsModel {
...
@@ -32,7 +34,8 @@ interface BindingsModel {
inline
fun
<
reified
T
>
decodeArray
(
data
:
ByteArray
?):
List
<
T
>
{
inline
fun
<
reified
T
>
decodeArray
(
data
:
ByteArray
?):
List
<
T
>
{
return
data
?.
run
{
return
data
?.
run
{
if
(
isValidData
())
{
if
(
isValidData
())
{
Gson
().
fromJson
(
decodeToString
(),
Array
<
T
>
::
class
.
java
).
toList
()
val
typeToken
=
object
:
TypeToken
<
Array
<
T
>>()
{}.
type
Gson
().
fromJson
<
Array
<
T
>>(
decodeToString
(),
typeToken
).
toList
()
}
else
listOf
()
}
else
listOf
()
}
?:
listOf
()
}
?:
listOf
()
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment