Merge branch 'dev' of github.com:jpush/jmessage-react-plugin into dev

Author: KenChoi

example/ios/JMessageDemo/AppDelegate.m

@@ -18,8 +18,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 {
   NSURL *jsCodeLocation;
 
-  jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
-//  jsCodeLocation = [NSURL URLWithString:@"http://192.168.9.113:8081/index.ios.bundle?platform=ios&dev=true"];
+//  jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
+  jsCodeLocation = [NSURL URLWithString:@"http://192.168.10.155:8081/index.ios.bundle?platform=ios&dev=true"];
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
                                                       moduleName:@"ReactJChat"
                                                initialProperties:nil

ios/RCTJMessageModule/RCTJMessageModule.m

@@ -1961,6 +1961,11 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
 
     JMSGMessage *message = [conversation messageWithMessageId: param[@"id"]];
 
+    if (!message) {
+      failCallback(@[[self getErrorWithLog:@"cann't find the message from this id"]]);
+      return;
+    }
+    
     if ([message.content isKindOfClass:[JMSGMediaAbstractContent class]]) {
       JMSGMediaAbstractContent *content = (JMSGMediaAbstractContent *)message.content;
       content.uploadHandler = ^(float percent, NSString *msgID) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.1.9",
+  "version": "2.2.0",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {