- Updated applications to SDK 5.1.0

Author: MarinTolic

samplejava/src/main/java/com/example/chattutorial/ChannelActivity2.java

@@ -61,10 +61,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         MessageInputViewModel messageInputViewModel = provider.get(MessageInputViewModel.class);
 
         // Set view factory manager for Imgur attachments
-        ImgurAttachmentViewFactory imgurAttachmentViewFactory = new ImgurAttachmentViewFactory();
+        ImgurAttachmentFactory imgurAttachmentFactory = new ImgurAttachmentFactory();
 
-        List<ImgurAttachmentViewFactory> imgurAttachmentViewFactories = new ArrayList<ImgurAttachmentViewFactory>();
-        imgurAttachmentViewFactories.add(imgurAttachmentViewFactory);
+        List<ImgurAttachmentFactory> imgurAttachmentViewFactories = new ArrayList<ImgurAttachmentFactory>();
+        imgurAttachmentViewFactories.add(imgurAttachmentFactory);
 
         AttachmentFactoryManager attachmentFactoryManager = new AttachmentFactoryManager(imgurAttachmentViewFactories);
         binding.messageListView.setAttachmentFactoryManager(attachmentFactoryManager);

samplejava/src/main/java/com/example/chattutorial/ChannelActivity3.java

@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.widget.TextView;
 
 import androidx.activity.OnBackPressedCallback;
@@ -63,10 +62,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         MessageInputViewModel messageInputViewModel = provider.get(MessageInputViewModel.class);
 
         // Set view factory manager for Imgur attachments
-        ImgurAttachmentViewFactory imgurAttachmentViewFactory = new ImgurAttachmentViewFactory();
+        ImgurAttachmentFactory imgurAttachmentFactory = new ImgurAttachmentFactory();
 
-        List<ImgurAttachmentViewFactory> imgurAttachmentViewFactories = new ArrayList<ImgurAttachmentViewFactory>();
-        imgurAttachmentViewFactories.add(imgurAttachmentViewFactory);
+        List<ImgurAttachmentFactory> imgurAttachmentViewFactories = new ArrayList<ImgurAttachmentFactory>();
+        imgurAttachmentViewFactories.add(imgurAttachmentFactory);
 
         AttachmentFactoryManager attachmentFactoryManager = new AttachmentFactoryManager(imgurAttachmentViewFactories);
         binding.messageListView.setAttachmentFactoryManager(attachmentFactoryManager);

samplejava/src/main/java/com/example/chattutorial/ChannelActivity4.java

@@ -69,10 +69,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         MessageInputViewModel messageInputViewModel = provider.get(MessageInputViewModel.class);
 
         // Set view factory manager for Imgur attachments
-        ImgurAttachmentViewFactory imgurAttachmentViewFactory = new ImgurAttachmentViewFactory();
+        ImgurAttachmentFactory imgurAttachmentFactory = new ImgurAttachmentFactory();
 
-        List<ImgurAttachmentViewFactory> imgurAttachmentViewFactories = new ArrayList<ImgurAttachmentViewFactory>();
-        imgurAttachmentViewFactories.add(imgurAttachmentViewFactory);
+        List<ImgurAttachmentFactory> imgurAttachmentViewFactories = new ArrayList<ImgurAttachmentFactory>();
+        imgurAttachmentViewFactories.add(imgurAttachmentFactory);
 
         AttachmentFactoryManager attachmentFactoryManager = new AttachmentFactoryManager(imgurAttachmentViewFactories);
         binding.messageListView.setAttachmentFactoryManager(attachmentFactoryManager);

…tutorial/ImgurAttachmentViewFactory.java …chattutorial/ImgurAttachmentFactory.javasamplejava/src/main/java/com/example/chattutorial/ImgurAttachmentViewFactory.java renamed to samplejava/src/main/java/com/example/chattutorial/ImgurAttachmentFactory.java samplejava/src/main/java/com/example/chattutorial/ImgurAttachmentViewFactory.java renamed to samplejava/src/main/java/com/example/chattutorial/ImgurAttachmentFactory.java

@@ -19,29 +19,37 @@
 import io.getstream.chat.android.ui.message.list.adapter.viewholder.attachment.AttachmentFactory;
 import io.getstream.chat.android.ui.message.list.adapter.viewholder.attachment.InnerAttachmentViewHolder;
 
-public class ImgurAttachmentViewFactory implements AttachmentFactory {
+/** A custom attachment factory to show an imgur logo if the attachment URL is an imgur image. **/
+public class ImgurAttachmentFactory implements AttachmentFactory {
 
 
+    // 1. Check whether the message contains an Imgur attachment
     @Override
     public boolean canHandle(@NonNull Message message) {
         return containsImgurAttachments(message) != null;
     }
 
+    // 2. Create the ViewHolder that will be used to display the Imgur logo
+    // over Imgur attachments
     @NonNull
     @Override
-    public InnerAttachmentViewHolder createViewHolder(@NonNull Message message, @Nullable MessageListListenerContainer messageListListenerContainer, @NonNull ViewGroup viewGroup) {
+    public InnerAttachmentViewHolder createViewHolder(
+            @NonNull Message message,
+            @Nullable MessageListListenerContainer listeners,
+            @NonNull ViewGroup parent
+    ) {
         Attachment imgurAttachment = containsImgurAttachments(message);
 
-        AttachmentImgurBinding attachmentImgurBinding = AttachmentImgurBinding.inflate(LayoutInflater.from(viewGroup.getContext()), null, false);
+        AttachmentImgurBinding attachmentImgurBinding = AttachmentImgurBinding.inflate(LayoutInflater.from(parent.getContext()), null, false);
 
         return new ImgurAttachmentViewHolder(attachmentImgurBinding, imgurAttachment);
     }
 
     private Attachment containsImgurAttachments(@NotNull Message message) {
         for (int i = 0; i < message.getAttachments().size(); i++) {
-            boolean containsAttachments = message.getAttachments().get(i).getImageUrl().contains("imgur");
+            String imageUrl = message.getAttachments().get(i).getImageUrl();
 
-            if (containsAttachments) {
+            if (imageUrl != null && imageUrl.contains("imgur")) {
                 return message.getAttachments().get(i);
             }
         }

…attutorial/ImgurAttachmentViewFactory.kt …e/chattutorial/ImgurAttachmentFactory.ktsamplekotlin/src/main/java/com/example/chattutorial/ImgurAttachmentViewFactory.kt renamed to samplekotlin/src/main/java/com/example/chattutorial/ImgurAttachmentFactory.kt samplekotlin/src/main/java/com/example/chattutorial/ImgurAttachmentViewFactory.kt renamed to samplekotlin/src/main/java/com/example/chattutorial/ImgurAttachmentFactory.kt

@@ -13,18 +13,20 @@ import io.getstream.chat.android.ui.message.list.adapter.viewholder.attachment.I
 /** A custom attachment factory to show an imgur logo if the attachment URL is an imgur image. */
 class ImgurAttachmentFactory : AttachmentFactory {
 
+    // 1. Check whether the message contains an Imgur attachment
     override fun canHandle(message: Message): Boolean {
         val imgurAttachment = message.attachments.firstOrNull { it.isImgurAttachment() }
         return imgurAttachment != null
     }
 
+    // 2. Create the ViewHolder that will be used to display the Imgur logo
+    // over Imgur attachments
     override fun createViewHolder(
         message: Message,
         listeners: MessageListListenerContainer?,
         parent: ViewGroup
     ): InnerAttachmentViewHolder {
-        val imgurAttachment = message.attachments.firstOrNull { it.isImgurAttachment() }
-            ?: return createViewHolder(message, listeners, parent)
+        val imgurAttachment = message.attachments.first() { it.isImgurAttachment() }
         val binding = AttachmentImgurBinding
             .inflate(LayoutInflater.from(parent.context), null, false)
         return ImgurAttachmentViewHolder(