From 289556f5eeca03d6c2bf3ac96ec2ad679545f0aa Mon Sep 17 00:00:00 2001
From: rimdoo <>
Date: Thu, 19 Jan 2023 14:22:31 +0900
Subject: [PATCH] Added 3.3.3

---
 CHANGELOG.md                                               | 3 +++
 gradle.properties                                          | 2 +-
 uikit-custom-sample/src/main/res/values/strings.xml        | 2 +-
 uikit-sample/src/main/res/values/strings.xml               | 2 +-
 uikit/build.gradle                                         | 2 +-
 .../sendbird/uikit/fragments/MessageThreadFragment.java    | 1 +
 .../com/sendbird/uikit/fragments/OpenChannelFragment.java  | 7 +++----
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6de87b6f..ece7aa94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### v3.3.3 (Jan 19, 2023) with Chat SDK `v4.2.1`
+* Improved stability
+
 ### v3.3.2 (Dec 09, 2022) with Chat SDK `v4.1.3`
 * Support authenticated file caching
 * Change the default value of `SendbirdUIKit.shouldUseImageCompression()` to `true`
diff --git a/gradle.properties b/gradle.properties
index 4b192616..9697c2a1 100644
--- 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.3.2
+UIKIT_VERSION = 3.3.3
 UIKIT_VERSION_CODE = 1
diff --git a/uikit-custom-sample/src/main/res/values/strings.xml b/uikit-custom-sample/src/main/res/values/strings.xml
index 9004242a..89f38e04 100644
--- a/uikit-custom-sample/src/main/res/values/strings.xml
+++ b/uikit-custom-sample/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="text_settings_change_user_profile_image">Change profile image</string>
 
     <string name="text_tab_channels">Channels</string>
-    <string name="text_tab_settings">My settings</string>
+    <string name="text_tab_settings">Settings</string>
     <string name="text_tab_badge_max_count">99+</string>
 
     <string name="text_sign_out">SIGN OUT</string>
diff --git a/uikit-sample/src/main/res/values/strings.xml b/uikit-sample/src/main/res/values/strings.xml
index bffa5b2f..8394ed44 100644
--- a/uikit-sample/src/main/res/values/strings.xml
+++ b/uikit-sample/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="text_settings_change_user_profile_image">Change profile image</string>
 
     <string name="text_tab_channels">Channels</string>
-    <string name="text_tab_settings">My settings</string>
+    <string name="text_tab_settings">Settings</string>
     <string name="text_tab_badge_max_count">99+</string>
 
     <string name="text_home">Home</string>
diff --git a/uikit/build.gradle b/uikit/build.gradle
index 22547ca3..eb5be8f8 100644
--- a/uikit/build.gradle
+++ b/uikit/build.gradle
@@ -65,7 +65,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Sendbird
-    api 'com.sendbird.sdk:sendbird-chat:4.1.3'
+    api 'com.sendbird.sdk:sendbird-chat:4.2.1'
 
     implementation 'com.github.bumptech.glide:glide:4.13.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.0'
diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/MessageThreadFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/MessageThreadFragment.java
index d6b30168..7b54c1a5 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/MessageThreadFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/MessageThreadFragment.java
@@ -350,6 +350,7 @@ protected void onBindStatusComponent(@NonNull StatusComponent statusComponent, @
     }
 
     private synchronized void loadInitial(long startingPoint) {
+        if (!isFragmentAlive()) return;
         isInitCallFinished.set(false);
         getViewModel().loadInitial(startingPoint);
     }
diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelFragment.java
index 55a3b238..4a217d55 100644
--- a/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelFragment.java
+++ b/uikit/src/main/java/com/sendbird/uikit/fragments/OpenChannelFragment.java
@@ -252,12 +252,11 @@ protected void onReady(@NonNull ReadyStatus status, @NonNull OpenChannelModule m
 
         module.getStatusComponent().notifyStatusChanged(StatusFrameView.Status.LOADING);
         viewModel.enterChannel(channel, e -> {
+            if (!isFragmentAlive()) return;
             module.getStatusComponent().notifyStatusChanged(StatusFrameView.Status.NONE);
             if (e != null) {
-                if (isFragmentAlive()) {
-                    toastError(R.string.sb_text_error_get_channel, getModule().getParams().shouldUseOverlayMode());
-                    shouldActivityFinish();
-                }
+                toastError(R.string.sb_text_error_get_channel, getModule().getParams().shouldUseOverlayMode());
+                shouldActivityFinish();
                 return;
             }
             viewModel.loadInitial();