Make the user to pass imageType and imageId

Author: rubengees

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

@@ -39,7 +39,7 @@ public Conference[] newArray(int size) {
     @Body(name = "count")
     private int participantAmount;
     @Body(name = "image")
-    private String imageId;
+    private String image;
     @Body(name = "group")
     private boolean isGroup;
     @Body(name = "read")
@@ -55,15 +55,15 @@ public Conference[] newArray(int size) {
     }
 
     public Conference(@NonNull String id, @NonNull String topic, @NonNull String customTopic,
-                      @IntRange(from = 2) int participantAmount, @NonNull String imageId,
-                      boolean isGroup, boolean isRead, long time,
+                      @IntRange(from = 2) int participantAmount, @NonNull String imageType,
+                      @NonNull String imageId, boolean isGroup, boolean isRead, long time,
                       @IntRange(from = 0) int unreadMessageAmount,
                       @NonNull String lastReadMessageId) {
         this.id = id;
         this.topic = topic;
         this.customTopic = customTopic;
         this.participantAmount = participantAmount;
-        this.imageId = imageId;
+        this.image = imageType + ":" + imageId;
         this.isGroup = isGroup;
         this.isRead = isRead;
         this.time = time;
@@ -73,7 +73,7 @@ public Conference(@NonNull String id, @NonNull String topic, @NonNull String cus
 
     protected Conference(Parcel in) {
         this.lastReadMessageId = in.readString();
-        this.imageId = in.readString();
+        this.image = in.readString();
         this.isRead = in.readByte() != 0;
         this.customTopic = in.readString();
         this.participantAmount = in.readInt();
@@ -91,7 +91,7 @@ public String getLastReadMessageId() {
 
     @NonNull
     public String getImageType() {
-        String[] split = imageId.split(":");
+        String[] split = image.split(":");
 
         if (split.length == 2) {
             return split[0];
@@ -103,7 +103,7 @@ public String getImageType() {
     @Override
     @NonNull
     public String getImageId() {
-        String[] split = imageId.split(":");
+        String[] split = image.split(":");
 
         if (split.length == 2) {
             return split[1];
@@ -164,7 +164,7 @@ public boolean equals(Object o) {
         if (isGroup != that.isGroup) return false;
         if (unreadMessageAmount != that.unreadMessageAmount) return false;
         if (!lastReadMessageId.equals(that.lastReadMessageId)) return false;
-        if (!imageId.equals(that.imageId)) return false;
+        if (!image.equals(that.image)) return false;
         if (!customTopic.equals(that.customTopic)) return false;
         if (!topic.equals(that.topic)) return false;
         return id.equals(that.id);
@@ -174,7 +174,7 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         int result = lastReadMessageId.hashCode();
-        result = 31 * result + imageId.hashCode();
+        result = 31 * result + image.hashCode();
         result = 31 * result + (isRead ? 1 : 0);
         result = 31 * result + customTopic.hashCode();
         result = 31 * result + participantAmount;
@@ -194,7 +194,7 @@ public int describeContents() {
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(this.lastReadMessageId);
-        dest.writeString(this.imageId);
+        dest.writeString(this.image);
         dest.writeByte(this.isRead ? (byte) 1 : (byte) 0);
         dest.writeString(this.customTopic);
         dest.writeInt(this.participantAmount);