[ENH] Change for public API for chat demo to include timeStamp in message listener

- Public API onReceiveServerMessage and onReceiveP2PMessage have been changed to include timeStamp in Long type
- Handle JSONObject when receiving from remote peer

Author: muoipham

sampleapp/src/main/java/sg/com/temasys/skylink/sdk/sampleapp/chat/ChatPresenter.java

@@ -3,6 +3,9 @@
 import android.content.Context;
 import android.util.Log;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -272,12 +275,25 @@ public void processServerMessageReceived(String remotePeerId, Object message, bo
             chatPrefix = "[GRP]" + chatPrefix;
         }
 
+        String remotePeerName = null;
+        String data = null;
+
         // add message to listview and update ui
         if (message instanceof String) {
-            String remotePeerName = chatService.getPeerNameById(remotePeerId);
-            chatMessageCollection.add(remotePeerName + " : " + chatPrefix + message);
-            chatView.updateUIChatCollection();
+            remotePeerName = chatService.getPeerNameById(remotePeerId);
+            data = (String) message;
+        } else if (message instanceof JSONObject) {
+            JSONObject jsonMessage = (JSONObject) message;
+            try {
+                remotePeerName = jsonMessage.getString("senderId");
+                data = jsonMessage.getString("data");
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
         }
+
+        chatMessageCollection.add(remotePeerName + " : " + chatPrefix + data);
+        chatView.updateUIChatCollection();
     }
 
     /**

sampleapp/src/main/java/sg/com/temasys/skylink/sdk/sampleapp/service/SkylinkCommonService.java

@@ -856,12 +856,14 @@ public void onUpdateFileTransferReceivingProgress(
      *                     or 'org.json.JSONArray'.
      * @param isPublic     Flag to specify whether the message was sent to us only (as opposed to
      *                     broadcast to all peers in the room).
+     * @param timeStamp    The timestamp of the message,
+     *                     The number of milliseconds since the epoch of 1970-01-01T00:00:00Z (midnight, January 1, 1970 UTC).
      * @param remotePeerId The id of the remote peer
      */
     @Override
-    public void onReceiveServerMessage(Object message, boolean isPublic, String
+    public void onReceiveServerMessage(Object message, boolean isPublic, Long timeStamp, String
             remotePeerId) {
-        Log.d(TAG, "onReceiveServerMessage(message: " + message + ",isPublic: " + isPublic + ", remotePeerId: " + remotePeerId);
+        Log.d(TAG, "onReceiveServerMessage(message: " + message + ",isPublic: " + isPublic + ", timeStamp: " + timeStamp + ", remotePeerId: " + remotePeerId);
 
         presenter.processServerMessageReceived(remotePeerId, message, !isPublic);
     }
@@ -874,12 +876,14 @@ public void onReceiveServerMessage(Object message, boolean isPublic, String
      *                     or 'org.json.JSONArray'.
      * @param isPublic     Flag to specify whether the message was sent to us only (as opposed to
      *                     broadcast to all peers in the room).
+     * @param timeStamp    The timestamp of the message,
+     *                     The number of milliseconds since the epoch of 1970-01-01T00:00:00Z (midnight, January 1, 1970 UTC).
      * @param remotePeerId The id of the remote peer
      */
     @Override
-    public void onReceiveP2PMessage(Object message, boolean isPublic, String
+    public void onReceiveP2PMessage(Object message, boolean isPublic, Long timeStamp, String
             remotePeerId) {
-        Log.d(TAG, "onReceiveP2PMessage(message: " + message + ",isPublic: " + isPublic + ", remotePeerId: " + remotePeerId);
+        Log.d(TAG, "onReceiveP2PMessage(message: " + message + ",isPublic: " + isPublic + ", timeStamp: " + timeStamp + ", remotePeerId: " + remotePeerId);
 
         presenter.processP2PMessageReceived(remotePeerId, message, !isPublic);
     }