feat: release V3.8.3-patch.10 (#74)

Author: OnYourMark-1995

android/build.gradle

@@ -58,6 +58,6 @@ dependencies {
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation 'androidx.collection:collection:1.1.0'
     implementation 'com.alibaba:fastjson:1.1.72.android'
-    implementation 'io.openim:core-sdk:3.8.3-patch3@aar'
+    implementation 'io.openim:core-sdk:3.8.3-patch10@aar'
     // implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
 }

android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java

@@ -208,7 +208,7 @@ public void getMultipleConversation(ReadableArray conversationIDList, String ope
   public void setGlobalRecvMessageOpt(int opt, String operationID, Promise promise) {
     JSONObject params = new JSONObject();
     params.put("globalRecvMsgOpt", opt);
-    Open_im_sdk.setGroupInfo(new BaseImpl(promise), operationID, params.toString());
+    Open_im_sdk.setSelfInfo(new BaseImpl(promise), operationID, params.toString());
   }
 
   @ReactMethod
@@ -279,9 +279,14 @@ public void getTotalUnreadMsgCount(String operationID, Promise promise) {
     Open_im_sdk.getTotalUnreadMsgCount(new BaseImpl(promise), operationID);
   }
 
+  /**
+   * @deprecated This method may lead to app crash and has been deprecated in the SDK.
+   * It is not exported in the JS API.
+   */
+  @Deprecated
   @ReactMethod
-  public String getAtAllTag(String OperationID) {
-    return Open_im_sdk.getAtAllTag(OperationID);
+  public void getAtAllTag(String OperationID, Promise promise) {
+    promise.resolve(Open_im_sdk.getAtAllTag(OperationID));
   }
 
   @ReactMethod
@@ -544,7 +549,7 @@ public void createFileMessageFromFullPath(ReadableMap options, String operationI
     String filePath = options.getString("filePath");
     String fileName = options.getString("fileName");
 
-    String message = Open_im_sdk.createFileMessage(operationID, filePath, fileName);
+    String message = Open_im_sdk.createFileMessageFromFullPath(operationID, filePath, fileName);
     try {
       JSONObject obj = JSON.parseObject(message);
       promise.resolve(emitter.convertJsonToMap(obj));
@@ -730,6 +735,7 @@ public void setFriendListener() {
     Open_im_sdk.setFriendListener(new OnFriendshipListener(reactContext));
   }
 
+  @ReactMethod
   public void getSpecifiedFriendsInfo(ReadableMap options, String operationID, Promise promise) {
     ReadableArray userIDList = options.getArray("userIDList");
     boolean filterBlack = false;
@@ -792,13 +798,13 @@ public void deleteFriend(String friendUserID, String operationID, Promise promis
   }
 
   @ReactMethod
-  public void getFriendApplicationListAsRecipient(String operationID, Promise promise) {
-    Open_im_sdk.getFriendApplicationListAsRecipient(new BaseImpl(promise), operationID);
+  public void getFriendApplicationListAsRecipient(String operationID, ReadableMap req, Promise promise) {
+    Open_im_sdk.getFriendApplicationListAsRecipient(new BaseImpl(promise), operationID, map2string(req));
   }
 
   @ReactMethod
-  public void getFriendApplicationListAsApplicant(String operationID, Promise promise) {
-    Open_im_sdk.getFriendApplicationListAsApplicant(new BaseImpl(promise), operationID);
+  public void getFriendApplicationListAsApplicant(String operationID, ReadableMap req, Promise promise) {
+    Open_im_sdk.getFriendApplicationListAsApplicant(new BaseImpl(promise), operationID, map2string(req));
   }
 
   @ReactMethod
@@ -862,7 +868,7 @@ public void changeGroupMute(ReadableMap options, String operationID, Promise pro
   @ReactMethod
   public void changeGroupMemberMute(ReadableMap options, String operationID, Promise promise) {
     Open_im_sdk.changeGroupMemberMute(new BaseImpl(promise), operationID, options.getString("groupID"),
-      options.getString("userID"), options.getInt("mutedSeconds"));
+      options.getString("userID"), (long) options.getDouble("mutedSeconds"));
   }
 
   @ReactMethod
@@ -974,13 +980,13 @@ public void inviteUserToGroup(ReadableMap options, String operationID, Promise p
   }
 
   @ReactMethod
-  public void getGroupApplicationListAsRecipient(String operationID, Promise promise) {
-    Open_im_sdk.getGroupApplicationListAsRecipient(new BaseImpl(promise), operationID);
+  public void getGroupApplicationListAsRecipient(String operationID, ReadableMap req, Promise promise) {
+    Open_im_sdk.getGroupApplicationListAsRecipient(new BaseImpl(promise), operationID, map2string(req));
   }
 
   @ReactMethod
-  public void getGroupApplicationListAsApplicant(String operationID, Promise promise) {
-    Open_im_sdk.getGroupApplicationListAsApplicant(new BaseImpl(promise), operationID);
+  public void getGroupApplicationListAsApplicant(String operationID, ReadableMap req, Promise promise) {
+    Open_im_sdk.getGroupApplicationListAsApplicant(new BaseImpl(promise), operationID, map2string(req));
   }
 
   @ReactMethod
@@ -1015,8 +1021,8 @@ public void isJoinGroup(String groupID, String operationID, Promise promise) {
   }
 
   @ReactMethod
-  public void updateFcmToken(ReadableMap options, String operationID, Promise promise) {
-    Open_im_sdk.updateFcmToken(new BaseImpl(promise), operationID, options.getString("fcmToken"), options.getInt("expireTime"));
+  public void updateFcmToken(String fcmToken, double expireTime, String operationID, Promise promise) {
+    Open_im_sdk.updateFcmToken(new BaseImpl(promise), operationID, fcmToken, (int)expireTime);
   }
 
   @ReactMethod
@@ -1077,29 +1083,34 @@ public void sendMessageNotOss(ReadableMap options, String operationID, Promise p
   }
 
   @ReactMethod
-  public void setAppBadge(Integer appUnreadCount, String operationID, Promise promise) {
-    Open_im_sdk.setAppBadge(new BaseImpl(promise), operationID, appUnreadCount);
+  public void setAppBadge(double appUnreadCount, String operationID, Promise promise) {
+    Open_im_sdk.setAppBadge(new BaseImpl(promise), operationID, (int)appUnreadCount);
   }
 
   @ReactMethod
   public void uploadLogs(ReadableMap options, String operationID, Promise promise) {
-    Open_im_sdk.uploadLogs(new BaseImpl(promise), operationID, options.getInt("line"), options.getString("ex"), new UploadLogProgressListener(reactContext, operationID));
+    Open_im_sdk.uploadLogs(new BaseImpl(promise), operationID, (long)options.getDouble("line"), options.getString("ex"), new UploadLogProgressListener(reactContext, operationID));
   }
 
   @ReactMethod
   public void logs(ReadableMap options, String operationID, Promise promise) {
-    long logLevel = options.getInt("logLevel");
+    long logLevel = (long)options.getDouble("logLevel");
     String file = options.getString("file");
-    long line = options.getInt("line");
+    long line = (long)options.getDouble("line");
     String msg = options.getString("msgs");
     String err = options.getString("err");
-    String keyAndValue = options.getString("keyAndValue");
-    Open_im_sdk.logs(new BaseImpl(promise), operationID, logLevel, file, line, msg, err, keyAndValue);
+    ReadableArray keyAndValue = options.getArray("keyAndValue");
+    Open_im_sdk.logs(new BaseImpl(promise), operationID, logLevel, file, line, msg, err, keyAndValue.toString());
   }
 
+  /**
+   * This method should be an async method with Promise parameter, otherwise it is incompatible with React Native 0.80+ versions.
+   * Details: https://github.com/openimsdk/open-im-sdk-reactnative/issues/72
+   * Note: React Native 0.82+ dropped support for the old architecture.
+   */
   @ReactMethod
-  public String getSdkVersion() {
-    return Open_im_sdk.getSdkVersion();
+  public void getSdkVersion(Promise promise) {
+    promise.resolve(Open_im_sdk.getSdkVersion());
   }
 
   @ReactMethod
@@ -1109,7 +1120,8 @@ public void uploadFile(ReadableMap reqData, String operationID, Promise promise)
   }
 
   @ReactMethod
-  public void unInitSDK(String operationID) {
+  public void unInitSDK(String operationID, Promise promise) {
     Open_im_sdk.unInitSDK(operationID);
+    promise.resolve(null);
   }
 }

ios/OpenImSdkRn.m

@@ -75,7 +75,7 @@ - (dispatch_queue_t)methodQueue {
   @"onRecvMessageExtensionsDeleted",
 
   @"onConversationChanged",
-  @"onConversationUserInputStatusChanged",
+  @"onInputStatusChanged",
   @"onNewConversation",
   @"onSyncServerFailed",
   @"onSyncServerFinish",
@@ -431,7 +431,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr {
 }
 
 RCT_EXPORT_METHOD(createQuoteMessage:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
-    NSString *result = Open_im_sdkCreateQuoteMessage(operationID,options[@"text"],options[@"message"]);
+    NSString *result = Open_im_sdkCreateQuoteMessage(operationID,options[@"text"], [options[@"message"] json]);
     NSDictionary *message = [self parseJsonStr2Dict:result];
     if (message) {
         resolver(message);
@@ -441,7 +441,10 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr {
 }
 
 RCT_EXPORT_METHOD(createAdvancedQuoteMessage:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
-    NSString *result = Open_im_sdkCreateAdvancedQuoteMessage(operationID,options[@"text"] ,options[@"message"],options[@"messageEntityList"]);
+    NSString *text = options[@"text"];
+    NSDictionary *quoteMessage = options[@"message"];
+    NSArray *messageEntityList = options[@"messageEntityList"];
+    NSString *result = Open_im_sdkCreateAdvancedQuoteMessage(operationID, text, [quoteMessage json], [messageEntityList json]);
     NSDictionary *message = [self parseJsonStr2Dict:result];
     if (message) {
         resolver(message);
@@ -820,10 +823,10 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr {
 RCT_EXPORT_METHOD(insertGroupMessageToLocalStorage:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
     RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter];
     NSDictionary *message = options[@"message"];
-    NSString *recvID = options[@"recvID"];
+    NSString *groupID = options[@"groupID"];
     NSString *sendID = options[@"sendID"];
 
-    Open_im_sdkInsertGroupMessageToLocalStorage(proxy, operationID, [message json], recvID, sendID);
+    Open_im_sdkInsertGroupMessageToLocalStorage(proxy, operationID, [message json], groupID, sendID);
 }
 
 RCT_EXPORT_METHOD(searchLocalMessages:(NSDictionary *)searchParam operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
@@ -897,14 +900,14 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr {
     Open_im_sdkDeleteFriend(proxy, operationID, friendUserID);
 }
 
-RCT_EXPORT_METHOD(getFriendApplicationListAsRecipient:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
+RCT_EXPORT_METHOD(getFriendApplicationListAsRecipient:(NSString *)operationID req: (NSDictionary *)req resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
     RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter];
-    Open_im_sdkGetFriendApplicationListAsRecipient(proxy, operationID);
+    Open_im_sdkGetFriendApplicationListAsRecipient(proxy, operationID, [req json]);
 }
 
-RCT_EXPORT_METHOD(getFriendApplicationListAsApplicant:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
+RCT_EXPORT_METHOD(getFriendApplicationListAsApplicant:(NSString *)operationID req: (NSDictionary *)req resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
     RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter];
-    Open_im_sdkGetFriendApplicationListAsApplicant(proxy, operationID);
+    Open_im_sdkGetFriendApplicationListAsApplicant(proxy, operationID, [req json]);
 }
 
 RCT_EXPORT_METHOD(acceptFriendApplication:(NSDictionary *)userIDHandleMsg operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
@@ -990,6 +993,15 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr {
     Open_im_sdkChangeGroupMute(proxy, operationID, groupID, isMute);
 }
 
+RCT_EXPORT_METHOD(changeGroupMemberMute:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
+    RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter];
+    NSString *groupID = options[@"groupID"];
+    NSString *userID = options[@"userID"];
+    long mutedSeconds = [options[@"mutedSeconds"] longValue];
+    
+    Open_im_sdkChangeGroupMemberMute(proxy, operationID, groupID, userID, mutedSeconds);
+}
+
 RCT_EXPORT_METHOD(setGroupMemberRoleLevel:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
     RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter];
 
@@ -1134,14 +1146,14 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr {
     Open_im_sdkInviteUserToGroup(proxy, operationID, groupID, reason, [userIDList json]);
 }
 
-RCT_EXPORT_METHOD(getGroupApplicationListAsRecipient:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
+RCT_EXPORT_METHOD(getGroupApplicationListAsRecipient:(NSString *)operationID req: (NSDictionary *)req resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
     RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter];
-    Open_im_sdkGetGroupApplicationListAsRecipient(proxy, operationID);
+    Open_im_sdkGetGroupApplicationListAsRecipient(proxy, operationID, [req json]);
 }
 
-RCT_EXPORT_METHOD(getGroupApplicationListAsApplicant:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
+RCT_EXPORT_METHOD(getGroupApplicationListAsApplicant:(NSString *)operationID req: (NSDictionary *)req resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
     RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter];
-    Open_im_sdkGetGroupApplicationListAsApplicant(proxy, operationID);
+    Open_im_sdkGetGroupApplicationListAsApplicant(proxy, operationID, [req json]);
 }
 
 RCT_EXPORT_METHOD(acceptGroupApplication:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
@@ -1185,7 +1197,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr {
     Open_im_sdkIsJoinGroup(proxy, operationID, groupID);
 }
 
-RCT_EXPORT_METHOD(addAdvancedMsgListener) {
+RCT_EXPORT_METHOD(setAdvancedMsgListener) {
     Open_im_sdkSetAdvancedMsgListener(self);
 }
 
@@ -1194,17 +1206,14 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr {
     Open_im_sdkUnInitSDK(operationID);
 }
 
-RCT_EXPORT_METHOD(updateFcmToken:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
+RCT_EXPORT_METHOD(updateFcmToken:(NSString *)fcmToken expireTime:(nonnull NSNumber *)expireTime operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
     RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter];
-    NSArray *userIDList = options[@"userIDList"];
-    NSInteger expiredTime = [options[@"expiredTime"] integerValue];
-
-    Open_im_sdkUpdateFcmToken(proxy, operationID, [userIDList json], (long)expiredTime);
+    Open_im_sdkUpdateFcmToken(proxy, operationID, fcmToken, (int64_t)[expireTime intValue]);
 }
 
-RCT_EXPORT_METHOD(setAppBadge:(int32_t)appUnreadCount operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
+RCT_EXPORT_METHOD(setAppBadge:(nonnull NSNumber *)appUnreadCount operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
     RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter];
-    Open_im_sdkSetAppBadge(proxy, operationID, appUnreadCount);
+    Open_im_sdkSetAppBadge(proxy, operationID, (int32_t)[appUnreadCount intValue]);
 }
 
 RCT_EXPORT_METHOD(uploadLogs:(NSDictionary *)options operationID:(NSString *)operationID  resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
@@ -1222,8 +1231,9 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr {
 
 RCT_EXPORT_METHOD(logs:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {
     RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter];
+    NSArray* keyAndValue = [options valueForKey:@"keyAndValue"];
 
-    Open_im_sdkLogs(proxy, operationID, [[options valueForKey:@"logLevel"] longValue],[options valueForKey:@"file"],[[options valueForKey:@"line"] longValue],[options valueForKey:@"msgs"],[options valueForKey:@"err"],[options valueForKey:@"keyAndValue"]);
+    Open_im_sdkLogs(proxy, operationID, [[options valueForKey:@"logLevel"] longValue],[options valueForKey:@"file"],[[options valueForKey:@"line"] longValue],[options valueForKey:@"msgs"],[options valueForKey:@"err"],[keyAndValue json]);
 }
 
 RCT_EXPORT_METHOD(getSdkVersion:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) {

open-im-sdk-rn.podspec

@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   # else
   s.static_framework = true
   s.dependency "React-Core"
-  s.dependency "OpenIMSDKCore","3.8.3+3"
+  s.dependency "OpenIMSDKCore","3.8.3-hotfix.10"
   s.library = 'resolv'
   # Don't install the dependencies when we run `pod install` in the old architecture.
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "open-im-sdk-rn",
-  "version": "3.8.3-patch.3",
+  "name": "@openim/rn-client-sdk",
+  "version": "3.8.3-patch.10",
   "description": "OpenIM SDK for react-native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",