Merge pull request #84 from JoshLipan/dev

Dev

Author: JoshLipan

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jmessage-phonegap-plugin",
-    "version": "3.5.2",
+    "version": "3.5.3",
     "description": "JMessage Cordova Plugin.",
     "cordova": {
         "id": "jmessage-phonegap-plugin",
@@ -24,7 +24,7 @@
     ],
     "devDependencies": {
         "cordova-plugin-device": "*",
-        "cordova-plugin-jcore": ">=1.2.0"
+        "cordova-plugin-jcore": ">=1.2.5"
     },
     "author": "JiGuang",
     "license": "MIT",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="jmessage-phonegap-plugin"
-        version="3.5.2">
+        version="3.5.3">
 
     <name>JMessage</name>
     <description>集成极光 IM 和推送功能</description>
@@ -153,6 +153,12 @@
                 android:name="cn.jpush.android.service.DataProvider"
                 android:exported="true" />
 
+            <!-- Required since JMessage 2.7.0 SDK 核心功能-->
+            <provider
+                android:name="cn.jpush.im.android.helpers.ipc.IMProvider"
+                android:authorities="$PACKAGE_NAME.IMProvider"
+                android:exported="false" />
+
             <meta-data android:name="JPUSH_APPKEY" android:value="$APP_KEY"/>
             <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
         </config-file>

src/android/ChatroomHandler.java

@@ -16,9 +16,7 @@
 import cn.jpush.im.android.api.model.Conversation;
 import cn.jpush.im.api.BasicCallback;
 
-import static cn.jiguang.cordova.im.JMessagePlugin.ERR_CODE_CONVERSATION;
 import static cn.jiguang.cordova.im.JMessagePlugin.ERR_CODE_PARAMETER;
-import static cn.jiguang.cordova.im.JMessagePlugin.ERR_MSG_CONVERSATION;
 import static cn.jiguang.cordova.im.JMessagePlugin.ERR_MSG_PARAMETER;
 import static cn.jiguang.cordova.im.JMessageUtils.handleResult;
 import static cn.jiguang.cordova.im.JsonUtils.toJson;
@@ -85,7 +83,7 @@ public void gotResult(int status, String desc, List<ChatRoomInfo> chatRoomInfoLi
     }
 
     static void getChatRoomInfoListById(JSONArray data, final CallbackContext callback) {
-        Set<Long> roomIds = new HashSet<Long>();    // JS 层为了和 iOS 统一，因此 roomId 类型为 String，在原生做转换。
+        Set<Long> roomIds = new HashSet<Long>(); // JS 层为了和 iOS 统一，因此 roomId 类型为 String，在原生做转换。
 
         try {
             JSONObject params = data.getJSONObject(0);
@@ -201,7 +199,7 @@ static void exitChatRoom(JSONArray data, final CallbackContext callback) {
         ChatRoomManager.leaveChatRoom(roomId, new BasicCallback() {
             @Override
             public void gotResult(int status, String desc) {
-                if (status == 0) {  // success
+                if (status == 0) { // success
                     callback.success();
                 } else {
                     handleResult(status, desc, callback);