Added 2.2.2

sendbird · Dec 21, 2021 · 7688166 · 7688166
1 parent 4b34216
commit 7688166
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+### v2.2.2 (Dec 21, 2021) with Core SDK `v3.1.3`
+* Improved stability.
+
 ### v2.2.1 (Dec 10, 2021) with Core SDK `v3.1.1`
 * Improved stability.
 

diff --git a/gradle.properties b/gradle.properties
@@ -17,6 +17,6 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enablerD8=true
 
-UIKIT_VERSION = 2.2.1
+UIKIT_VERSION = 2.2.2
 UIKIT_VERSION_CODE = 1
 
diff --git a/uikit-custom-sample/build.gradle b/uikit-custom-sample/build.gradle
@@ -36,7 +36,7 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
 //    implementation project(":uikit")
-    implementation "com.sendbird.sdk:uikit:2.2.1"
+    implementation "com.sendbird.sdk:uikit:2.2.2"
 
     implementation "androidx.multidex:multidex:2.0.1"
     implementation 'com.google.firebase:firebase-messaging:21.0.0'

diff --git a/uikit-sample/build.gradle b/uikit-sample/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 //    implementation project(":uikit")
-    implementation "com.sendbird.sdk:uikit:2.2.1"
+    implementation "com.sendbird.sdk:uikit:2.2.2"
 
     implementation "androidx.multidex:multidex:2.0.1"
     implementation 'com.google.firebase:firebase-messaging:21.0.0'

diff --git a/uikit/build.gradle b/uikit/build.gradle
@@ -57,7 +57,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Sendbird
-    api 'com.sendbird.sdk:sendbird-android-sdk:3.1.1'
+    api 'com.sendbird.sdk:sendbird-android-sdk:3.1.3'
 
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'

diff --git a/uikit/src/main/java/com/sendbird/uikit/activities/adapter/MessageListAdapter.java b/uikit/src/main/java/com/sendbird/uikit/activities/adapter/MessageListAdapter.java
@@ -163,30 +163,33 @@ public MessageViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewT
                 entry.getValue().setOnClickListener(v -> {
                     int messagePosition = viewHolder.getAdapterPosition();
                     if (messagePosition != NO_POSITION) {
-                        if (listItemClickListener != null) {
-                            listItemClickListener.onIdentifiableItemClick(v, identifier, messagePosition, getItem(messagePosition));
-                        }
-
                         // for backward compatibilities
                         if (listener != null && identifier.equals(ClickableViewIdentifier.Chat.name())) {
                             listener.onItemClick(v, messagePosition, getItem(messagePosition));
+                            return;
                         }
                         if (profileClickListener != null && identifier.equals(ClickableViewIdentifier.Profile.name())) {
                             profileClickListener.onItemClick(v, messagePosition, getItem(messagePosition));
+                            return;
+                        }
+
+                        if (listItemClickListener != null) {
+                            listItemClickListener.onIdentifiableItemClick(v, identifier, messagePosition, getItem(messagePosition));
                         }
                     }
                 });
 
                 entry.getValue().setOnLongClickListener(v -> {
                     int messagePosition = viewHolder.getAdapterPosition();
                     if (messagePosition != NO_POSITION) {
-                        if (listItemLongClickListener != null) {
-                            listItemLongClickListener.onIdentifiableItemLongClick(v, identifier, messagePosition, getItem(messagePosition));
-                        }
-
                         // for backward compatibilities
                         if (longClickListener != null && identifier.equals(ClickableViewIdentifier.Chat.name())) {
                             longClickListener.onItemLongClick(v, messagePosition, getItem(messagePosition));
+                            return true;
+                        }
+
+                        if (listItemLongClickListener != null) {
+                            listItemLongClickListener.onIdentifiableItemLongClick(v, identifier, messagePosition, getItem(messagePosition));
                         }
                         return true;
                     }

diff --git a/uikit/src/main/java/com/sendbird/uikit/model/MessageList.java b/uikit/src/main/java/com/sendbird/uikit/model/MessageList.java
@@ -1,9 +1,9 @@
 package com.sendbird.uikit.model;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.sendbird.android.BaseMessage;
-import com.sendbird.android.MessageListParams;
 import com.sendbird.android.log.Logger;
 import com.sendbird.uikit.utils.DateUtils;
 
@@ -22,6 +22,7 @@ enum Order {
     }
 
     private final Order order;
+    @NonNull
     private final TreeSet<BaseMessage> messages;
     private final Map<String, BaseMessage> timelineMap = new ConcurrentHashMap<>();
 
@@ -197,14 +198,18 @@ public void updateAll(@NonNull List<BaseMessage> messages) {
     /**
      * @return the latest message.
      */
+    @Nullable
     public BaseMessage getLatestMessage() {
+        if (messages.isEmpty()) return null;
         return order == Order.DESC ? messages.first() : messages.last();
     }
 
     /**
      * @return the oldest message.
      */
+    @Nullable
     public BaseMessage getOldestMessage() {
+        if (messages.isEmpty()) return null;
         return order == Order.DESC ? messages.last() : messages.first();
     }
 

diff --git a/uikit/src/main/java/com/sendbird/uikit/vm/ChannelViewModel.java b/uikit/src/main/java/com/sendbird/uikit/vm/ChannelViewModel.java
@@ -153,10 +153,12 @@ public void setMessageCollectionHandler(@Nullable MessageCollectionHandler handl
         this.handler = handler;
     }
 
+    @Nullable
     public BaseMessage getOldestMessage() {
         return cachedMessages.getOldestMessage();
     }
 
+    @Nullable
     public BaseMessage getLatestMessage() {
         return cachedMessages.getLatestMessage();
     }

diff --git a/uikit/src/main/java/com/sendbird/uikit/vm/OpenChannelViewModel.java b/uikit/src/main/java/com/sendbird/uikit/vm/OpenChannelViewModel.java
@@ -358,7 +358,8 @@ private void notifyDataSetChanged() {
     private void requestChangeLogs(@NonNull BaseChannel channel) {
         String channelUrl = channel.getUrl();
         int cacheMessageSize = messageCollection.size();
-        long lastSyncTs = cacheMessageSize > 0 ? messageCollection.getLatestMessage().getCreatedAt() : 0;
+        BaseMessage lastMessage = messageCollection.getLatestMessage();
+        long lastSyncTs = cacheMessageSize > 0 && lastMessage != null ? lastMessage.getCreatedAt() : 0;
         Logger.dev("++ change logs channel url = %s, lastSyncTs = %s", channelUrl, lastSyncTs);
 
         if (lastSyncTs > 0) {
@@ -564,7 +565,8 @@ public List<BaseMessage> loadPrevious() throws Exception {
         try {
             messageLoadState.postValue(MessageLoadState.LOAD_STARTED);
             int cacheMessageSize = messageCollection.size();
-            long ts = cacheMessageSize > 0 ? messageCollection.getOldestMessage().getCreatedAt() : Long.MAX_VALUE;
+            BaseMessage oldMessage = messageCollection.getOldestMessage();
+            long ts = cacheMessageSize > 0 && oldMessage != null ? oldMessage.getCreatedAt() : Long.MAX_VALUE;
             newMessageList = loadPrevious(ts);
             Logger.i("++ load previous message list : " + newMessageList);
             messageCollection.addAll(newMessageList);

diff --git a/uikit/src/main/java/com/sendbird/uikit/widgets/ImageWaffleView.java b/uikit/src/main/java/com/sendbird/uikit/widgets/ImageWaffleView.java
@@ -123,21 +123,28 @@ private ImageView pollOrNewImageView(Queue<ImageView> prevImageViews) {
     protected void dispatchDraw(Canvas canvas) {
         int width = getWidth();
         int height = getHeight();
+
         if (isInEditMode()) {
             Paint debugPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
             debugPaint.setColor(getResources().getColor(R.color.background_400));
             canvas.drawRoundRect(new RectF(0, 0, width, height), ROUNDING_RADIUS, ROUNDING_RADIUS, debugPaint);
             return;
         }
 
-        if (tempBitmap == null || tempBitmap.isRecycled() || (tempBitmap.getWidth() != getWidth() || tempBitmap.getHeight() != getHeight())) {
+        if (width == 0 || height == 0) {
+            super.dispatchDraw(canvas);
+            return;
+        }
+
+        if (tempBitmap == null || tempBitmap.isRecycled() || (tempBitmap.getWidth() != width || tempBitmap.getHeight() != height)) {
             if (tempBitmap != null) {
                 tempBitmap.recycle();
             }
+
             try {
-                tempBitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.ARGB_8888);
+                tempBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
             } catch (OutOfMemoryError e) {
-                tempBitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.RGB_565);
+                tempBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565);
             }
         } else {
             tempBitmap.eraseColor(Color.TRANSPARENT);