1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 10450b8d..d413d059 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -42,7 +42,8 @@ import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.entities.FileParams;
 import de.thedevstack.conversationsplus.enums.FileStatus;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
-
+import de.thedevstack.conversationsplus.utils.ui.TextViewUtil;
+import de.thedevstack.conversationsplus.utils.ui.ViewUtil;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession;
 import eu.siacs.conversations.entities.Account;
@@ -237,9 +238,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             FileStatus fileStatus = message.getFileParams().getFileStatus();
             if (fileStatus == FileStatus.DELETE_FAILED || fileStatus == FileStatus.DELETED || fileStatus == FileStatus.DELETING) {
                 viewHolder.remoteFileStatus.setVisibility(View.VISIBLE);
-                viewHolder.remoteFileStatus.setTypeface(null, Typeface.ITALIC);
                 switch (fileStatus) {
                     case DELETE_FAILED:
+                        TextViewUtil.setColor(viewHolder.remoteFileStatus, R.color.error);
                         viewHolder.remoteFileStatus.setText(R.string.remote_filestatus_delete_failed);
                         break;
                     case DELETED:
@@ -606,8 +607,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         ViewHolder viewHolder = new ViewHolder(view);
         if (SENT == type
                 || RECEIVED == type) {
-            viewHolder.message_box = (LinearLayout) view.findViewById(R.id.message_box);
-            viewHolder.message_box.setVisibility(View.VISIBLE);
+            viewHolder.message_box = ViewUtil.visible(view, R.id.message_box);
             viewHolder.indicator = (ImageView) view.findViewById(R.id.security_indicator);
             viewHolder.messageBody = (TextView) view.findViewById(R.id.message_body);
             viewHolder.time = (TextView) view.findViewById(R.id.message_time);
@@ -619,17 +619,17 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             viewHolder.image = (ImageView) view.findViewById(R.id.message_image);
         }
         if (RECEIVED == type) { // Extra block as preparation for new /me representation
-            viewHolder.contact_picture = (ImageView) view.findViewById(R.id.message_photo);
-            viewHolder.contact_picture.setVisibility(View.VISIBLE);
+            viewHolder.contact_picture = ViewUtil.visible(view, R.id.message_photo);
         }
         if (RECEIVED == type) {
             viewHolder.encryption = (TextView) view.findViewById(R.id.message_encryption);
         }
         if (STATUS == type) {
-            viewHolder.contact_picture = (ImageView) view.findViewById(R.id.message_photo);
-            viewHolder.contact_picture.setVisibility(View.VISIBLE);
-            viewHolder.status_message = (TextView) view.findViewById(R.id.status_message);
-            viewHolder.status_message.setVisibility(View.VISIBLE);
+            viewHolder.contact_picture = ViewUtil.visible(view, R.id.message_photo);
+            viewHolder.status_message = TextViewUtil.visible(view, R.id.status_message);
+        }
+        if (SENT == type) {
+            viewHolder.remoteFileStatus = TextViewUtil.gone(view, R.id.remote_file_status);
         }
         view.setTag(viewHolder);