From eea7f7ebfebe8458ec5c32bd10a68324eb08e83d Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 9 Oct 2018 15:06:14 +0200
Subject: [PATCH] Fix #303

---
 .../MagicPreviewMessageViewHolder.java        | 21 ++++++++++++-------
 app/src/main/res/layout/controller_chat.xml   |  2 --
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java
index bf7e7e10e..e0bddfe34 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java
@@ -51,23 +51,30 @@ public class MagicPreviewMessageViewHolder extends MessageHolders.IncomingImageM
         if (userAvatar != null) {
             if (message.isGrouped) {
                 userAvatar.setVisibility(View.INVISIBLE);
+                ((RoundedImageView) image).setCorners(R.dimen.message_bubble_corners_radius, R.dimen.message_bubble_corners_radius, 0, 0);
             } else {
                 userAvatar.setVisibility(View.VISIBLE);
             }
         }
 
-        if (message.isGrouped) {
-            ((RoundedImageView) image).setCorners(R.dimen.message_bubble_corners_radius, R.dimen.message_bubble_corners_radius, 0, 0);
-        } else if (message.getUser().getId().equals(message.activeUserId)) {
-            ((RoundedImageView) image).setCorners(R.dimen.message_bubble_corners_radius, 0, 0, 0);
+
+        if (message.getUser().getId().equals(message.activeUserId)) {
+            time.setTextColor(NextcloudTalkApplication.getSharedApplication().getResources().getColor(R.color.white60));
+            if (!message.isGrouped) {
+                ((RoundedImageView) image).setCorners(R.dimen.message_bubble_corners_radius, 0, 0, 0);
+            }
         } else {
-            ((RoundedImageView) image).setCorners(0, R.dimen.message_bubble_corners_radius, 0, 0);
+            time.setTextColor(NextcloudTalkApplication.getSharedApplication().getResources().getColor(R.color.warm_grey_four));
+            if (!message.isGrouped) {
+                ((RoundedImageView) image).setCorners(0, R.dimen.message_bubble_corners_radius, 0, 0);
+            }
         }
 
+
         messageText.setText(message.getSelectedIndividualHashMap().get("name"));
         image.setOnClickListener(v -> {
-                Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(message.getSelectedIndividualHashMap().get("link")));
-                NextcloudTalkApplication.getSharedApplication().getApplicationContext().startActivity(browserIntent);
+            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(message.getSelectedIndividualHashMap().get("link")));
+            NextcloudTalkApplication.getSharedApplication().getApplicationContext().startActivity(browserIntent);
         });
     }
 }
diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml
index b91ec5d69..837469b78 100644
--- a/app/src/main/res/layout/controller_chat.xml
+++ b/app/src/main/res/layout/controller_chat.xml
@@ -94,8 +94,6 @@
         app:outcomingTimeTextSize="12sp"
         app:outcomingImageTimeTextSize="12sp"
         app:incomingImageTimeTextSize="12sp"
-        app:outcomingImageTimeTextColor="@color/white60"
-        app:incomingImageTimeTextColor="@color/warm_grey_four"
         app:textAutoLink="all"/>
 
     <com.webianks.library.PopupBubble