Reorder constructor parameters, add missing fields and fix imageId

Author: rubengees

library/src/main/java/com/proxerme/library/connection/messenger/entity/Conference.java

@@ -30,45 +30,30 @@ public Conference[] newArray(int size) {
         }
     };
 
-    @Body(name = "read_mid")
-    private String lastReadMessageId;
-    @Body(name = "image")
-    private String imageId;
-    @Body(name = "read")
-    private boolean isRead;
+    @Body(name = "id")
+    private String id;
+    @Body(name = "topic")
+    private String topic;
     @Body(name = "topic_custom")
     private String customTopic;
     @Body(name = "count")
     private int participantAmount;
-    @Body(name = "topic")
-    private String topic;
-    @Body(name = "id")
-    private String id;
-    @Body(name = "timestamp_end")
-    private long time;
+    @Body(name = "image")
+    private String imageId;
     @Body(name = "group")
     private boolean isGroup;
+    @Body(name = "read")
+    private boolean isRead;
+    @Body(name = "timestamp_end")
+    private long time;
     @Body(name = "read_count")
     private int unreadMessageAmount;
+    @Body(name = "read_mid")
+    private String lastReadMessageId;
 
     Conference() {
     }
 
-    public Conference(@NonNull String lastReadMessageId, @NonNull String imageId, boolean isRead,
-                      @NonNull String customTopic, int participantAmount, @NonNull String topic,
-                      @NonNull String id, long time, boolean isGroup, int unreadMessageAmount) {
-        this.lastReadMessageId = lastReadMessageId;
-        this.imageId = imageId;
-        this.isRead = isRead;
-        this.customTopic = customTopic;
-        this.participantAmount = participantAmount;
-        this.topic = topic;
-        this.id = id;
-        this.time = time;
-        this.isGroup = isGroup;
-        this.unreadMessageAmount = unreadMessageAmount;
-    }
-
     protected Conference(Parcel in) {
         this.lastReadMessageId = in.readString();
         this.imageId = in.readString();
@@ -87,10 +72,27 @@ public String getLastReadMessageId() {
         return lastReadMessageId;
     }
 
+    @NonNull
+    public String getImageType() {
+        String[] split = imageId.split(":");
+
+        if (split.length == 2) {
+            return split[0];
+        } else {
+            return "";
+        }
+    }
+
     @Override
     @NonNull
     public String getImageId() {
-        return imageId;
+        String[] split = imageId.split(":");
+
+        if (split.length == 2) {
+            return split[1];
+        } else {
+            return "";
+        }
     }
 
     public boolean isRead() {

library/src/main/java/com/proxerme/library/connection/messenger/entity/Message.java

@@ -16,7 +16,7 @@
 
 public class Message implements IdItem, TimeItem, Parcelable {
 
-    public static final Parcelable.Creator<Message> CREATOR = new Parcelable.Creator<Message>() {
+    public static final Creator<Message> CREATOR = new Creator<Message>() {
         @Override
         public Message createFromParcel(Parcel source) {
             return new Message(source);
@@ -34,38 +34,42 @@ public Message[] newArray(int size) {
     String conferenceId;
     @Body(name = "user_id")
     String userId;
+    @Body(name = "username")
+    String username;
     @Body(name = "message")
     String message;
     @Body(name = "action")
     String action;
     @Body(name = "timestamp")
     long time;
-    @Body(name = "username")
-    String username;
+    @Body(name = "device")
+    String device;
 
     Message() {
     }
 
     public Message(@NonNull String id, @NonNull String conferenceId, @NonNull String userId,
-                   @NonNull String message, @NonNull String action, long time,
-                   @NonNull String username) {
+                   @NonNull String username, @NonNull String message, @NonNull String action,
+                   long time, @NonNull String device) {
         this.id = id;
         this.conferenceId = conferenceId;
         this.userId = userId;
+        this.username = username;
         this.message = message;
         this.action = action;
         this.time = time;
-        this.username = username;
+        this.device = device;
     }
 
     protected Message(Parcel in) {
         this.id = in.readString();
         this.conferenceId = in.readString();
         this.userId = in.readString();
+        this.username = in.readString();
         this.message = in.readString();
         this.action = in.readString();
         this.time = in.readLong();
-        this.username = in.readString();
+        this.device = in.readString();
     }
 
     @NonNull
@@ -84,6 +88,11 @@ public String getUserId() {
         return userId;
     }
 
+    @NonNull
+    public String getUsername() {
+        return username;
+    }
+
     @NonNull
     public String getMessage() {
         return message;
@@ -100,8 +109,8 @@ public long getTime() {
     }
 
     @NonNull
-    public String getUsername() {
-        return username;
+    public String getDevice() {
+        return device;
     }
 
     @Override
@@ -115,9 +124,10 @@ public boolean equals(Object o) {
         if (!id.equals(message1.id)) return false;
         if (!conferenceId.equals(message1.conferenceId)) return false;
         if (!userId.equals(message1.userId)) return false;
+        if (!username.equals(message1.username)) return false;
         if (!message.equals(message1.message)) return false;
         if (!action.equals(message1.action)) return false;
-        return username.equals(message1.username);
+        return device.equals(message1.device);
 
     }
 
@@ -126,10 +136,11 @@ public int hashCode() {
         int result = id.hashCode();
         result = 31 * result + conferenceId.hashCode();
         result = 31 * result + userId.hashCode();
+        result = 31 * result + username.hashCode();
         result = 31 * result + message.hashCode();
         result = 31 * result + action.hashCode();
         result = 31 * result + (int) (time ^ (time >>> 32));
-        result = 31 * result + username.hashCode();
+        result = 31 * result + device.hashCode();
         return result;
     }
 
@@ -143,9 +154,10 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(this.id);
         dest.writeString(this.conferenceId);
         dest.writeString(this.userId);
+        dest.writeString(this.username);
         dest.writeString(this.message);
         dest.writeString(this.action);
         dest.writeLong(this.time);
-        dest.writeString(this.username);
+        dest.writeString(this.device);
     }
 }