Merged latest remote commit into local project.

Author: Desnoo

README.md

@@ -2,7 +2,7 @@
 
 ### What is this?
 
-This is a library, prviding some core functionality for an Android App aiming
+This is a library, providing some core functionality for an Android App aiming
 to implement the API of the [Proxer.me](https://proxer.me/) website.
 
 ### Including in your project

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

@@ -4,6 +4,7 @@
 import android.os.Parcelable;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import com.afollestad.bridge.annotations.Body;
 import com.proxerme.library.interfaces.IdItem;
@@ -39,7 +40,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,25 +56,30 @@ 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, @Nullable String imageType,
+                      @Nullable 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.isGroup = isGroup;
         this.isRead = isRead;
         this.time = time;
         this.unreadMessageAmount = unreadMessageAmount;
         this.lastReadMessageId = lastReadMessageId;
+
+        if (imageType == null || imageType.isEmpty() || imageId == null || imageType.isEmpty()) {
+            this.image = "";
+        } else {
+            this.image = imageType + ":" + imageId;
+        }
     }
 
     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 +97,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 +109,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 +170,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 +180,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 +200,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);

library/src/main/java/com/proxerme/library/connection/messenger/request/SendMessageRequest.java

@@ -0,0 +1,54 @@
+package com.proxerme.library.connection.messenger.request;
+
+import android.support.annotation.NonNull;
+
+import com.afollestad.bridge.Form;
+import com.afollestad.bridge.Response;
+import com.proxerme.library.connection.ProxerRequest;
+import com.proxerme.library.connection.messenger.result.SendMessageResult;
+import com.proxerme.library.info.ProxerTag;
+import com.proxerme.library.info.ProxerUrlHolder;
+
+/**
+ * TODO: Describe class
+ *
+ * @author Ruben Gees
+ */
+
+public class SendMessageRequest extends ProxerRequest<SendMessageResult> {
+
+    private static final String SEND_MESSAGE_URL = "/api/v1/messenger/setmessage";
+
+    private static final String CONFERENCE_ID_FORM = "conference_id";
+    private static final String TEXT_FORM = "text";
+
+    private String conferenceId;
+    private String text;
+
+    public SendMessageRequest(@NonNull String conferenceId, @NonNull String text) {
+        this.conferenceId = conferenceId;
+        this.text = text;
+    }
+
+    @Override
+    protected int getTag() {
+        return ProxerTag.MESSENGER_SEND_MESSAGE;
+    }
+
+    @Override
+    protected SendMessageResult parse(@NonNull Response response) throws Exception {
+        return response.asClass(SendMessageResult.class);
+    }
+
+    @NonNull
+    @Override
+    protected String getURL() {
+        return ProxerUrlHolder.getHost() + SEND_MESSAGE_URL;
+    }
+
+    @Override
+    protected Form getBody() {
+        return new Form().add(CONFERENCE_ID_FORM, conferenceId)
+                .add(TEXT_FORM, text);
+    }
+}

library/src/main/java/com/proxerme/library/connection/messenger/result/SendMessageResult.java

@@ -0,0 +1,32 @@
+package com.proxerme.library.connection.messenger.result;
+
+import android.support.annotation.Nullable;
+
+import com.afollestad.bridge.annotations.Body;
+import com.proxerme.library.interfaces.ProxerResult;
+
+/**
+ * TODO: Describe class
+ *
+ * @author Ruben Gees
+ */
+
+public class SendMessageResult implements ProxerResult<String> {
+
+    @Nullable
+    @Body(name = "data")
+    String item;
+
+    SendMessageResult() {
+    }
+
+    public SendMessageResult(@Nullable String item) {
+        this.item = item;
+    }
+
+    @Override
+    @Nullable
+    public String getItem() {
+        return item;
+    }
+}

library/src/main/java/com/proxerme/library/info/ProxerTag.java

@@ -25,11 +25,11 @@ public class ProxerTag {
     public static final int INFO_ENTRY_SYNONYM = 21;
     public static final int INFO_ENTRY_SEASON = 22;
 
-
     public static final int MESSENGER_CONFERENCES = 30;
     public static final int MESSENGER_MESSAGES = 31;
-    public static final int MESSENGER_CONFERENCE_CONSTANTS = 32;
-    public static final int MESSENGER_CONFERENCE_INFO = 33;
+    public static final int MESSENGER_SEND_MESSAGE = 32;
+    public static final int MESSENGER_CONFERENCE_CONSTANTS = 33;
+    public static final int MESSENGER_CONFERENCE_INFO = 34;
 
     public static final int CONFERENCES = 100;
     public static final int CHAT = 101;
@@ -41,7 +41,8 @@ public class ProxerTag {
     @IntDef({LOGIN, NEWS, LOGOUT, USERINFO, TOPTEN, CONFERENCES, CHAT, SEND_MESSAGE,
             USER_MEDIA_LIST, MEDIA_LIST, MEDIA_SEARCH,
             INFO_ENTRY_CORE, INFO_ENTRY_SYNONYM, INFO_ENTRY_SEASON,
-            MESSENGER_CONFERENCES, MESSENGER_MESSAGES, MESSENGER_CONFERENCE_CONSTANTS, MESSENGER_CONFERENCE_INFO})
+            MESSENGER_CONFERENCES, MESSENGER_MESSAGES, MESSENGER_SEND_MESSAGE,
+            MESSENGER_CONFERENCE_CONSTANTS, MESSENGER_CONFERENCE_INFO})
     @Retention(RetentionPolicy.SOURCE)
     @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
     public @interface ConnectionTag {