Change delivered/read message to call rest api

Author: zetbaitsu

chat/src/main/java/com/qiscus/sdk/data/remote/QiscusApi.java

@@ -600,6 +600,12 @@ public Observable<QiscusChatRoom> updateChatRoom(int roomId, String name, String
                 .doOnNext(qiscusChatRoom1 -> Qiscus.getDataStore().addOrUpdate(qiscusChatRoom1));
     }
 
+    public Observable<Void> updateCommentStatus(int roomId, int lastReadId, int lastReceivedId) {
+        return api.updateCommentStatus(Qiscus.getToken(), roomId, lastReadId, lastReceivedId)
+                .map(jsonElement -> null);
+    }
+
+
     private interface Api {
 
         @FormUrlEncoded
@@ -651,6 +657,13 @@ Observable<JsonElement> updateChatRoom(@Field("token") String token,
                                                @Field("room_name") String name,
                                                @Field("avatar_url") String avatarUrl,
                                                @Field("options") String options);
+
+        @FormUrlEncoded
+        @POST("/api/v2/mobile/update_comment_status")
+        Observable<JsonElement> updateCommentStatus(@Field("token") String token,
+                                                    @Field("room_id") int roomId,
+                                                    @Field("last_comment_read_id") int lastReadId,
+                                                    @Field("last_comment_received_id") int lastReceivedId);
     }
 
     private static class CountingFileRequestBody extends RequestBody {

chat/src/main/java/com/qiscus/sdk/data/remote/QiscusPusherApi.java

@@ -52,6 +52,9 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
 public enum QiscusPusherApi implements MqttCallback, IMqttActionListener {
 
     INSTANCE;
@@ -272,35 +275,19 @@ public void setUserTyping(int roomId, int topicId, boolean typing) {
 
 
     public void setUserRead(int roomId, int topicId, int commentId, String commentUniqueId) {
-        if (!mqttAndroidClient.isConnected()) {
-            connect();
-        }
-        try {
-            MqttMessage message = new MqttMessage();
-            message.setPayload((commentId + ":" + commentUniqueId).getBytes());
-            message.setQos(1);
-            message.setRetained(true);
-            pendingTokens.add(mqttAndroidClient.publish("r/" + roomId + "/" + topicId + "/"
-                    + qiscusAccount.getEmail() + "/r", message));
-        } catch (MqttException | NullPointerException e) {
-            e.printStackTrace();
-        }
+        QiscusApi.getInstance().updateCommentStatus(roomId, commentId, 0)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(aVoid -> {
+                }, Throwable::printStackTrace);
     }
 
     public void setUserDelivery(int roomId, int topicId, int commentId, String commentUniqueId) {
-        if (!mqttAndroidClient.isConnected()) {
-            connect();
-        }
-        try {
-            MqttMessage message = new MqttMessage();
-            message.setPayload((commentId + ":" + commentUniqueId).getBytes());
-            message.setQos(1);
-            message.setRetained(true);
-            pendingTokens.add(mqttAndroidClient.publish("r/" + roomId + "/" + topicId + "/"
-                    + qiscusAccount.getEmail() + "/d", message));
-        } catch (MqttException | NullPointerException e) {
-            e.printStackTrace();
-        }
+        QiscusApi.getInstance().updateCommentStatus(roomId, 0, commentId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(aVoid -> {
+                }, Throwable::printStackTrace);
     }
 
     @Override