Chat: empty messages are not shown (space removed)

app/src/main/java/com/xabber/android/ui/adapter/ChatMessageAdapter.java

@@ -183,7 +183,13 @@ public class ChatMessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
         switch (viewType) {
             case VIEW_TYPE_HINT:
-                ((HintMessage)holder).info.setText(hint);
+                HintMessage hintMessage = (HintMessage) holder;
+                if (hint == null || hint.trim().isEmpty()) {
+                    (hintMessage).info.setVisibility(View.GONE);
+                } else {
+                    (hintMessage).info.setText(hint);
+                    (hintMessage).info.setVisibility(View.VISIBLE);
+                }
                 break;
 
             case VIEW_TYPE_ACTION_MESSAGE:
@@ -194,8 +200,7 @@ public class ChatMessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
                 break;
 
             case VIEW_TYPE_INCOMING_MESSAGE:
-                setUpMessage(messageItem, (Message) holder);
-                setUpAvatar(messageItem, (IncomingMessage) holder);
+                setUpIncomingMessage((IncomingMessage) holder, messageItem);
                 break;
             case VIEW_TYPE_OUTGOING_MESSAGE:
                 setUpMessage(messageItem, (Message) holder);
@@ -205,6 +210,22 @@ public class ChatMessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
     }
 
+    private void setUpIncomingMessage(IncomingMessage incomingMessage, MessageItem messageItem) {
+        setUpMessage(messageItem, incomingMessage);
+
+        setUpAvatar(messageItem, incomingMessage);
+
+        if (messageItem.getText().trim().isEmpty()) {
+            incomingMessage.messageBalloon.setVisibility(View.GONE);
+            incomingMessage.messageTime.setVisibility(View.GONE);
+            incomingMessage.avatar.setVisibility(View.GONE);
+        } else {
+            incomingMessage.messageBalloon.setVisibility(View.VISIBLE);
+            incomingMessage.messageTime.setVisibility(View.VISIBLE);
+        }
+
+    }
+
     @Override
     public int getItemCount() {
         return messages.size() + 1;
@@ -254,14 +275,7 @@ public class ChatMessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
         message.messageText.setTextAppearance(context, appearanceStyle);
 
-        String text = messageItem.getText().trim();
-
-        if (text.isEmpty()) {
-            message.itemView.setVisibility(View.GONE);
-        } else {
-            message.itemView.setVisibility(View.VISIBLE);
-            message.messageText.setText(text);
-        }
+        message.messageText.setText(messageItem.getText().trim());
 
         message.messageBalloon.getBackground().setLevel(AccountManager.getInstance().getColorLevel(account));
 

app/src/main/res/layout/chat_viewer_empty.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
-
-     This file is part of Xabber project; you can redistribute it and/or
-     modify it under the terms of the GNU General Public License, Version 3.
-
-     Xabber is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-     See the GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License,
-     along with this program. If not, see http://www.gnu.org/licenses/.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="1px"
-    />
\ No newline at end of file