diff --git a/app/src/main/java/com/nynja/mobile/communicator/data/models/mqtt/Room.java b/app/src/main/java/com/nynja/mobile/communicator/data/models/mqtt/Room.java index ea358a62986f82c358d9ceb4792a53e8f31dfc16..10ca00386058fc004bf386ebf8cd82e2912fab9c 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/data/models/mqtt/Room.java +++ b/app/src/main/java/com/nynja/mobile/communicator/data/models/mqtt/Room.java @@ -2,6 +2,7 @@ package com.nynja.mobile.communicator.data.models.mqtt; import android.os.Parcel; +import com.nynja.mobile.communicator.data.models.mqtt.annotations.Either; import com.nynja.mobile.communicator.data.models.mqtt.annotations.Order; import com.nynja.mobile.communicator.data.models.mqtt.base.BaseParcelMQTT; import com.nynja.mobile.communicator.data.server.bert.BertAtom; @@ -23,7 +24,9 @@ public class Room extends BaseParcelMQTT { @Order(10) public String tos; @Order(11) public Long updatedTos = 0L; @Order(12) public Long unread = 0L; + @Either({Long.class}) @Order(13) public List mentions = new ArrayList<>(); + @Either({Long.class}) @Order(14) public List readers = new ArrayList<>(); @Order(15) public Message last_msg; @Order(16) public Long update = 0L; diff --git a/app/src/main/java/com/nynja/mobile/communicator/data/models/nynjamodels/RoomModel.java b/app/src/main/java/com/nynja/mobile/communicator/data/models/nynjamodels/RoomModel.java index 1979ae9ddf2b442f3f6ca414d8bc6284a30f30ef..e9faa22ea196824a31191a066cd77f735154cfb0 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/data/models/nynjamodels/RoomModel.java +++ b/app/src/main/java/com/nynja/mobile/communicator/data/models/nynjamodels/RoomModel.java @@ -114,8 +114,8 @@ public class RoomModel extends BaseNynjaModel { this.tos = room.tos; this.updatedTos = room.updatedTos; this.unread = room.unread; - this.mentions = new ArrayList<>(room.mentions); - this.readers = new ArrayList<>(room.readers); + this.mentions = (room.mentions != null? new ArrayList<>(room.mentions) : new ArrayList<>()); + this.readers = (room.readers != null? new ArrayList<>(room.readers) : new ArrayList<>()); if (room.last_msg != null) this.last_msg = new MessageModel(room.last_msg); this.update = room.update; this.created = room.created;