Merge pull request #15 from sendbird/release/3.9.1

3.9.1
sendbird · Sep 26, 2023 · 53c39e9 · 53c39e9
2 parents 27eff38 + af866a9
commit 53c39e9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+### v3.9.1 (Sep 26, 2023) with Chat SDK `v4.12.1`
+* Fixed a problem with the user mentions feature in ThreadFragment
+* Filter deactivated users from the user mentions list.
 ### v3.9.0 (Sep 22, 2023) with Chat SDK `v4.12.1`
 * Support Multiple files message
   * Added `setEnableMultipleFilesMessage(boolean)`, `getEnableMultipleFilesMessage()` in `ChannelConfig`.

diff --git a/gradle.properties b/gradle.properties
@@ -16,5 +16,5 @@ org.gradle.jvmargs=-Xmx1536m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 
-UIKIT_VERSION = 3.9.0
+UIKIT_VERSION = 3.9.1
 UIKIT_VERSION_CODE = 1
diff --git a/uikit/src/main/java/com/sendbird/uikit/vm/BaseMessageListViewModel.java b/uikit/src/main/java/com/sendbird/uikit/vm/BaseMessageListViewModel.java
@@ -48,7 +48,7 @@ abstract public class BaseMessageListViewModel extends BaseViewModel implements
     @NonNull
     private final String channelUrl;
     @Nullable
-    private MemberFinder memberFinder;
+    MemberFinder memberFinder;
     @NonNull
     final MessageList cachedMessages = new MessageList();
     @NonNull

diff --git a/uikit/src/main/java/com/sendbird/uikit/vm/MemberFinder.java b/uikit/src/main/java/com/sendbird/uikit/vm/MemberFinder.java
@@ -100,6 +100,7 @@ private List<User> getFilteredMembers(@NonNull GroupChannel channel, @NonNull St
         if (SendbirdUIKit.getAdapter() != null) {
             final String myUserId = SendbirdUIKit.getAdapter().getUserInfo().getUserId();
             for (Member member : members) {
+                if (!member.isActive()) continue;
                 final String nickname = member.getNickname();
                 if (nickname.toLowerCase().startsWith(nicknameStartWith.toLowerCase()) && !myUserId.equalsIgnoreCase(member.getUserId())) {
                     if (filteredList.size() >= maxMemberCount) {
@@ -135,6 +136,7 @@ private List<User> getFilteredMembers(@NonNull MemberListQuery query) throws Exc
         if (SendbirdUIKit.getAdapter() != null) {
             final String myUserId = SendbirdUIKit.getAdapter().getUserInfo().getUserId();
             for (Member member : results.get()) {
+                if (!member.isActive()) continue;
                 if (!myUserId.equalsIgnoreCase(member.getUserId())) {
                     if (filteredList.size() >= maxSuggestionCount) {
                         return filteredList;

diff --git a/uikit/src/main/java/com/sendbird/uikit/vm/MessageThreadViewModel.java b/uikit/src/main/java/com/sendbird/uikit/vm/MessageThreadViewModel.java
@@ -140,6 +140,7 @@ public void authenticate(@NonNull AuthenticateHandler handler) {
                     if (e1 != null || channel == null) {
                         handler.onAuthenticationFailed();
                     } else {
+                        this.memberFinder = new MemberFinder(channel, SendbirdUIKit.getUserMentionConfig());
                         prepareThreadViewModel(channel, e2 -> {
                             if (e2 != null) {
                                 handler.onAuthenticationFailed();