Merge pull request #5 from jpush/dev

Dev

Author: KenChoi1992

android/jmessage-react-plugin.iml

@@ -3,6 +3,7 @@
 
 public class MyConversation {
 
+    private String id;
     private String title;
     private String username;
     private String groupId;
@@ -12,8 +13,9 @@ public class MyConversation {
     private String lastMsg;
     private String appKey;
 
-    public MyConversation(String title, String username, String groupId, String avatarPath,
+    public MyConversation(String id, String title, String username, String groupId, String avatarPath,
                           int unreadMsgCnt, long date, String lastMsg, String appKey) {
+        this.id = id;
         this.title = title;
         this.username = username;
         this.groupId = groupId;

android/src/io/jchat/android/entity/MyConversation.java

@@ -81,11 +81,12 @@ public ConversationToJSON(Context context, Conversation conv) {
                         lastMsg = context.getString(R.string.type_custom);
                     }
                     break;
-                default:
+                case text:
                     lastMsg = ((TextContent) message.getContent()).getText();
+                    break;
             }
         }
-        myConversation = new MyConversation(title, username, groupId, avatar, unreadMsgCnt,
+        myConversation = new MyConversation(conv.getId(), title, username, groupId, avatar, unreadMsgCnt,
                 date, lastMsg, conv.getTargetAppKey());
         Gson gson = new Gson();
         mResult = gson.toJson(myConversation);
@@ -140,13 +141,15 @@ public ConversationToJSON(Context context, List<Conversation> data) {
                             lastMsg = context.getString(R.string.type_custom);
                         }
                         break;
-                    default:
+                    case text:
                         lastMsg = ((TextContent) message.getContent()).getText();
+                        break;
                 }
             }
-            myConversation = new MyConversation(title, username, groupId, avatar, unreadMsgCnt,
+            myConversation = new MyConversation(conv.getId(), title, username, groupId, avatar, unreadMsgCnt,
                     date, lastMsg, conv.getTargetAppKey());
             list.add(myConversation);
+            lastMsg = "";
         }
         Gson gson = new Gson();
         mResult = gson.toJson(list);