Merge pull request #117 from sendbird/v4.2.21

Add 4.2.21.

Author: sf-tyler-jeong

CHANGELOG.md

@@ -1,3 +1,11 @@
+## v4.2.21 (Aug 16, 2024)
+
+### Improvements
+- Fixed the bug when upserting a parent message regarding the error on isar
+- Fixed the bug regarding the channel filtering when local caching is not used
+- Fixed the bugs regarding the thumbnail caching for UIKit
+- Fixed a bug regarding reactions on offline mode
+
 ## v4.2.20 (Jul 11, 2024)
 
 ### Improvements

README.md

@@ -50,7 +50,7 @@ Before installing Sendbird Chat SDK, you need to create a Sendbird application o
 
 ```yaml
 dependencies:
-  sendbird_chat_sdk: ^4.2.20
+  sendbird_chat_sdk: ^4.2.21
 ```
 
 - Run `flutter pub get` command in your project directory.

lib/src/internal/db/schema/message/c_base_message.dart

@@ -156,31 +156,35 @@ class CBaseMessage extends CRootMessage {
   static Future<void> upsert(Chat chat, Isar isar, BaseMessage message) async {
     // BaseMessage
     await chat.dbManager.write(() async {
-      if (message is UserMessage) {
-        await isar.cUserMessages.put(CUserMessage.fromUserMessage(message));
-      } else if (message is FileMessage) {
-        await isar.cFileMessages.put(CFileMessage.fromFileMessage(message));
-      } else if (message is AdminMessage) {
-        await isar.cAdminMessages.put(CAdminMessage.fromAdminMessage(message));
-      }
+      await _upsert(chat, isar, message);
+    });
+  }
 
-      // parentMessage
-      if (message.parentMessage != null) {
-        await CBaseMessage.upsert(chat, isar, message.parentMessage!);
-      }
+  static Future<void> _upsert(Chat chat, Isar isar, BaseMessage message) async {
+    if (message is UserMessage) {
+      await isar.cUserMessages.put(CUserMessage.fromUserMessage(message));
+    } else if (message is FileMessage) {
+      await isar.cFileMessages.put(CFileMessage.fromFileMessage(message));
+    } else if (message is AdminMessage) {
+      await isar.cAdminMessages.put(CAdminMessage.fromAdminMessage(message));
+    }
 
-      // threadInfo
-      if (message.threadInfo != null) {
-        for (final user in message.threadInfo!.mostRepliesUsers) {
-          await isar.cUsers.put(CUser.fromUser(user));
-        }
-      }
+    // parentMessage
+    if (message.parentMessage != null) {
+      await _upsert(chat, isar, message.parentMessage!);
+    }
 
-      // sender
-      if (message.sender != null) {
-        await isar.cUsers.put(CUser.fromUser(message.sender!));
+    // threadInfo
+    if (message.threadInfo != null) {
+      for (final user in message.threadInfo!.mostRepliesUsers) {
+        await isar.cUsers.put(CUser.fromUser(user));
       }
-    });
+    }
+
+    // sender
+    if (message.sender != null) {
+      await isar.cUsers.put(CUser.fromUser(message.sender!));
+    }
   }
 }
 

lib/src/internal/main/chat/chat.dart

@@ -62,7 +62,7 @@ part 'chat_notifications.dart';
 part 'chat_push.dart';
 part 'chat_user.dart';
 
-const sdkVersion = '4.2.20';
+const sdkVersion = '4.2.21';
 
 // Internal implementation for main class. Do not directly access this class.
 class Chat with WidgetsBindingObserver {
@@ -290,7 +290,7 @@ class Chat with WidgetsBindingObserver {
   }
 
   AppInfo? getAppInfo() {
-    sbLog.i(StackTrace.current);
+    // sbLog.i(StackTrace.current);
     return chatContext.appInfo;
   }
 

lib/src/internal/main/chat_manager/db_manager.dart

@@ -148,6 +148,9 @@ class DBManager {
         await _db.write(writeFunc);
       } catch (e) {
         sbLog.e(StackTrace.current, e.toString());
+        if (_chat.isTest) {
+          rethrow;
+        }
 
         _chat.chatContext.options.useCollectionCaching = false;
         await clear();

lib/src/public/core/channel/base_channel/base_channel_message.dart

@@ -71,8 +71,7 @@ extension BaseChannelMessage on BaseChannel {
     ) as UserMessage;
 
     if (this is GroupChannel) {
-      pendingUserMessage.messageId =
-          resendMessageId ?? DateTime.now().millisecondsSinceEpoch;
+      pendingUserMessage.messageId = resendMessageId ?? 0;
 
       for (final messageCollection
           in chat.collectionManager.baseMessageCollections) {
@@ -103,7 +102,8 @@ extension BaseChannelMessage on BaseChannel {
       final error = ConnectionRequiredException();
       pendingUserMessage
         ..errorCode = error.code
-        ..sendingStatus = SendingStatus.failed;
+        ..sendingStatus = SendingStatus.failed
+        ..messageId = resendMessageId ?? DateTime.now().millisecondsSinceEpoch;
 
       if (this is GroupChannel) {
         for (final messageCollection
@@ -160,7 +160,9 @@ extension BaseChannelMessage on BaseChannel {
       if (e is SendbirdException) {
         pendingUserMessage
           ..errorCode = e.code ?? SendbirdError.unknownError
-          ..sendingStatus = SendingStatus.failed;
+          ..sendingStatus = SendingStatus.failed
+          ..messageId =
+              resendMessageId ?? DateTime.now().millisecondsSinceEpoch;
 
         if (this is GroupChannel) {
           for (final messageCollection
@@ -276,8 +278,7 @@ extension BaseChannelMessage on BaseChannel {
     pendingFileMessage.messageCreateParams = params;
 
     if (this is GroupChannel) {
-      pendingFileMessage.messageId =
-          resendMessageId ?? DateTime.now().millisecondsSinceEpoch;
+      pendingFileMessage.messageId = resendMessageId ?? 0;
 
       for (final messageCollection
           in chat.collectionManager.baseMessageCollections) {
@@ -321,7 +322,10 @@ extension BaseChannelMessage on BaseChannel {
                 .timeout(
               Duration(seconds: chat.chatContext.options.fileTransferTimeout),
               onTimeout: () {
-                pendingFileMessage.sendingStatus = SendingStatus.failed;
+                pendingFileMessage
+                  ..sendingStatus = SendingStatus.failed
+                  ..messageId =
+                      resendMessageId ?? DateTime.now().millisecondsSinceEpoch;
 
                 if (this is GroupChannel) {
                   for (final messageCollection
@@ -377,7 +381,9 @@ extension BaseChannelMessage on BaseChannel {
             final error = ConnectionRequiredException();
             messageBeforeSent
               ..errorCode = error.code
-              ..sendingStatus = SendingStatus.failed;
+              ..sendingStatus = SendingStatus.failed
+              ..messageId =
+                  resendMessageId ?? DateTime.now().millisecondsSinceEpoch;
 
             if (this is GroupChannel) {
               for (final messageCollection
@@ -411,7 +417,8 @@ extension BaseChannelMessage on BaseChannel {
                 result.payload,
                 channelType: channelType,
                 commandType: result.cmd,
-              ) as FileMessage;
+              ) as FileMessage
+                    ..file = params.fileInfo.file; // Check
 
               chat.collectionManager.onMessageSentByMe(
                 channel: this,
@@ -482,7 +489,9 @@ extension BaseChannelMessage on BaseChannel {
       if (e is SendbirdException) {
         pendingFileMessage
           ..errorCode = e.code ?? SendbirdError.unknownError
-          ..sendingStatus = SendingStatus.failed;
+          ..sendingStatus = SendingStatus.failed
+          ..messageId =
+              resendMessageId ?? DateTime.now().millisecondsSinceEpoch;
 
         if (this is GroupChannel) {
           for (final messageCollection

lib/src/public/core/message/base_message.dart

@@ -249,34 +249,39 @@ class BaseMessage extends RootMessage {
   bool applyReactionEvent(ReactionEvent event) {
     sbLog.i(StackTrace.current, 'event.key: ${event.key}');
 
-    if (event.messageId != messageId) {
-      return false;
-    }
+    try {
+      if (event.messageId != messageId) {
+        return false;
+      }
 
-    final keys = reactions?.map((e) => e.key).toList();
-    final existIndex = keys?.indexWhere((e) => e == event.key) ?? -1;
-    if (existIndex != -1) {
-      final reaction = reactions?[existIndex];
-      if (reaction != null && reaction.merge(event)) {
-        if (event.operation == ReactionEventAction.delete &&
-            reaction.userIds.isEmpty) {
-          reactions?.removeWhere((e) => e.key == event.key);
+      final keys = reactions?.map((e) => e.key).toList();
+      final existIndex = keys?.indexWhere((e) => e == event.key) ?? -1;
+      if (existIndex != -1) {
+        final reaction = reactions?[existIndex];
+        if (reaction != null && reaction.merge(event)) {
+          if (event.operation == ReactionEventAction.delete &&
+              reaction.userIds.isEmpty) {
+            reactions?.removeWhere((e) => e.key == event.key);
+          }
+          return true;
+        } else {
+          return false;
         }
+      } else if (event.operation == ReactionEventAction.add) {
+        final reaction = Reaction(
+          key: event.key,
+          userIds: [event.userId],
+          updatedAt: event.updatedAt,
+        );
+        reactions?.add(reaction);
         return true;
       } else {
         return false;
       }
-    } else if (event.operation == ReactionEventAction.add) {
-      final reaction = Reaction(
-        key: event.key,
-        userIds: [event.userId],
-        updatedAt: event.updatedAt,
-      );
-      reactions?.add(reaction);
-      return true;
-    } else {
-      return false;
+    } catch (e) {
+      sbLog.e(StackTrace.current, 'e: $e');
     }
+    return false;
   }
 
   /// Retrieves a [BaseMessage] object with a specified message ID.

lib/src/public/main/chat/sendbird_chat.dart

@@ -129,7 +129,7 @@ class SendbirdChat {
 
   /// Returns current application information with [AppInfo].
   static AppInfo? getAppInfo() {
-    sbLog.i(StackTrace.current);
+    // sbLog.i(StackTrace.current);
     return _instance._chat.getAppInfo();
   }