1 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index ac8fba0a..a6bdec69 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -57,6 +57,8 @@ import de.thedevstack.conversationsplus.utils.CryptoHelper;
 import de.thedevstack.conversationsplus.utils.GeoHelper;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.UIHelper;
+import de.thedevstack.conversationsplus.utils.ui.TextViewUtil;
+import de.thedevstack.conversationsplus.utils.ui.ViewUtil;
 
 public class MessageAdapter extends ArrayAdapter<Message> {
 
@@ -605,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);
@@ -618,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.visible(view, R.id.remote_file_status);
         }
         view.setTag(viewHolder);