Enabled setting the senderId post-constructor

Author: mradzinski

.gitignore

@@ -37,5 +37,4 @@ android/proguard/
 .idea/
 build/
 .gradle
-/.DS_Store
-/gradle/.DS_Store
+*.DS_Store

chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageHolders.java

@@ -26,6 +26,7 @@
 
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 
 /*
@@ -597,16 +598,23 @@ public void onClick(View v) {
     }
 
 
-    protected int getViewType(Object item, String senderId) {
+    protected int getViewType(Object item, @Nullable String senderId) {
         boolean isOutcoming = false;
+
         int viewType;
 
         if (item instanceof IMessage) {
-            IMessage message = (IMessage) item;
-            isOutcoming = message.getUser().getId().contentEquals(senderId);
-            viewType = getContentViewType(message);
-
-        } else viewType = VIEW_TYPE_DATE_HEADER;
+            if (senderId != null) {
+                IMessage message = (IMessage) item;
+                isOutcoming = message.getUser().getId().contentEquals(senderId);
+                viewType = getContentViewType(message);
+            } else {
+                throw new IllegalStateException("Missing senderId. Did you call setSenderId or " +
+                        "passed it in the constructor?");
+            }
+        } else {
+            viewType = VIEW_TYPE_DATE_HEADER;
+        }
 
         return isOutcoming ? viewType * -1 : viewType;
     }

chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListAdapter.java

@@ -40,6 +40,7 @@
 import java.util.List;
 
 import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 /**
@@ -70,13 +71,21 @@ public class MessagesListAdapter<MESSAGE extends IMessage>
     private DateFormatter.Formatter dateHeadersFormatter;
     private SparseArray<OnMessageViewClickListener> viewClickListenersArray = new SparseArray<>();
 
+    public MessagesListAdapter(ImageLoader imageLoader) {
+        this((String) null, imageLoader);
+    }
+
+    public MessagesListAdapter(MessageHolders holders, ImageLoader imageLoader) {
+        this(null, holders, imageLoader);
+    }
+
     /**
      * For default list item layout and view holder.
      *
      * @param senderId    identifier of sender.
      * @param imageLoader image loading method.
      */
-    public MessagesListAdapter(String senderId, ImageLoader imageLoader) {
+    public MessagesListAdapter(@Nullable String senderId, ImageLoader imageLoader) {
         this(senderId, new MessageHolders(), imageLoader);
     }
 
@@ -87,7 +96,7 @@ public MessagesListAdapter(String senderId, ImageLoader imageLoader) {
      * @param holders     custom layouts and view holders. See {@link MessageHolders} documentation for details
      * @param imageLoader image loading method.
      */
-    public MessagesListAdapter(String senderId, MessageHolders holders,
+    public MessagesListAdapter(@Nullable String senderId, MessageHolders holders,
                                ImageLoader imageLoader) {
         this.senderId = senderId;
         this.holders = holders;
@@ -143,6 +152,15 @@ public int getMessagesCount() {
      * PUBLIC METHODS
      * */
 
+    /**
+     * Sets the sender id for this adapter instance. Note that this will override
+     * any id previously set.
+     * @param senderId The sender id.
+     */
+    public void setSenderId(String senderId) {
+        this.senderId = senderId;
+    }
+
     /**
      * Adds message to bottom of list and scroll if needed.
      *

sample/src/main/java/com/stfalcon/chatkit/sample/features/demo/def/DefaultMessagesActivity.java

@@ -54,7 +54,7 @@ public void onAddAttachments() {
     }
 
     private void initAdapter() {
-        super.messagesAdapter = new MessagesListAdapter<>(super.senderId, super.imageLoader);
+        super.messagesAdapter = new MessagesListAdapter<>(super.imageLoader);
         super.messagesAdapter.enableSelectionMode(this);
         super.messagesAdapter.setLoadMoreListener(this);
         super.messagesAdapter.registerViewClickListener(R.id.chatkit_messageUserAvatar,
@@ -67,6 +67,8 @@ public void onMessageViewClick(View view, Message message) {
                     }
                 });
         this.messagesList.setAdapter(super.messagesAdapter);
+
+        super.messagesAdapter.setSenderId(super.senderId);
     }
 
     @Override