Merge remote-tracking branch 'origin/master'

Author: YashStudentAccount

app/src/main/java/com/techknightsrtu/crosstalks/app/feature/chat/viewholder/MessageItemViewHolder.java

@@ -14,7 +14,6 @@ public class MessageItemViewHolder extends RecyclerView.ViewHolder {
 
     public TextView tvMessage, tvTimeStamp,tvMsgSeen, tvDirectReplyMessage;
     public LinearLayout ll1;
-    public RelativeLayout rlDirectReply;
 
     public MessageItemViewHolder(@NonNull View itemView) {
         super(itemView);
@@ -24,8 +23,6 @@ public MessageItemViewHolder(@NonNull View itemView) {
         tvMsgSeen = itemView.findViewById(R.id.tvMsgSeen);
         tvDirectReplyMessage = itemView.findViewById(R.id.tvDirectReplyMessage);
 
-        rlDirectReply = itemView.findViewById(R.id.rvDirectReply);
-
         ll1 = itemView.findViewById(R.id.ll1);
     }
 }

app/src/main/java/com/techknightsrtu/crosstalks/firebase/ChatMethods.java

@@ -291,7 +291,9 @@ public static void removeCurrentUserFromChatChannel(String channelId, String cha
             @Override
             public void onDataChange(@NonNull DataSnapshot snapshot) {
 
-                if(snapshot.getChildrenCount() == 1){
+                Log.d(TAG, "onDataChange: " + snapshot);
+
+                if(snapshot.getChildrenCount() <= 1){
                     chatChannelsRef.removeValue();
                 }else{
                     chatChannelsRef.child("members").child(FirebaseMethods.getUserId()).removeValue();