diff options
author | Stefan Niedermann <info@niedermann.it> | 2020-07-13 14:43:31 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2020-07-13 14:43:31 +0300 |
commit | e8f941b8e0f956d57e608c998345436eb6a76275 (patch) | |
tree | 15aa1d1e1d42cfb98181f282d156dd17aaa34abd /app/src/main/java/it/niedermann/nextcloud/deck/api | |
parent | 9d0c0666a216893a2d213b284113968067151769 (diff) | |
parent | 85e3c11d33865c73497b07c69bf34d0ad7ecf84f (diff) |
Merge branch '453-move-cards'
# Conflicts:
# app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/api')
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java index b9f6f403d..7c1727fb7 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonConfig.java @@ -40,6 +40,7 @@ public class GsonConfig { Type capabilities = new TypeToken<Capabilities>() {}.getType(); Type ocsUserList = new TypeToken<OcsUserList>() {}.getType(); Type activity = new TypeToken<Activity>() {}.getType(); + Type activityList = new TypeToken<List<Activity>>() {}.getType(); Type attachment = new TypeToken<Attachment>() {}.getType(); Type attachmentList = new TypeToken<List<Attachment>>() {}.getType(); Type comment = new TypeToken<OcsComment>() {}.getType(); @@ -59,6 +60,7 @@ public class GsonConfig { .registerTypeAdapter(capabilities, new NextcloudDeserializer<>("capability", Capabilities.class)) .registerTypeAdapter(ocsUserList, new NextcloudDeserializer<>("ocsUserList", OcsUserList.class)) .registerTypeAdapter(activity, new NextcloudDeserializer<>("activity", Activity.class)) + .registerTypeAdapter(activityList, new NextcloudDeserializer<>("activityList", Activity.class)) .registerTypeAdapter(attachmentList, new NextcloudArrayDeserializer<>("attachments", Attachment.class)) .registerTypeAdapter(attachment, new NextcloudDeserializer<>("attachment", Attachment.class)) .registerTypeAdapter(comment, new NextcloudDeserializer<>("comment", OcsComment.class)) |