Merge branch 'siacs/master' into development

1 files changed, 15 insertions, 0 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index a4a80dc4b..f5f48a262 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -59,6 +59,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		TextView mLastMessage = (TextView) view.findViewById(R.id.conversation_lastmsg);
 		TextView mTimestamp = (TextView) view.findViewById(R.id.conversation_lastupdate);
 		ImageView imagePreview = (ImageView) view.findViewById(R.id.conversation_lastimage);
+		ImageView notificationStatus = (ImageView) view.findViewById(R.id.notification_status);
 
 		Message message = conversation.getLatestMessage();
 
@@ -94,6 +95,20 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			}
 		}
 
+		long muted_till = conversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
+		if (muted_till == Long.MAX_VALUE) {
+			notificationStatus.setVisibility(View.VISIBLE);
+			notificationStatus.setImageResource(R.drawable.ic_notifications_off_grey600_24dp);
+		} else if (muted_till >= System.currentTimeMillis()) {
+			notificationStatus.setVisibility(View.VISIBLE);
+			notificationStatus.setImageResource(R.drawable.ic_notifications_paused_grey600_24dp);
+		} else if (conversation.alwaysNotify()) {
+			notificationStatus.setVisibility(View.GONE);
+		} else {
+			notificationStatus.setVisibility(View.VISIBLE);
+			notificationStatus.setImageResource(R.drawable.ic_notifications_none_grey600_24dp);
+		}
+
 		mTimestamp.setText(UIHelper.readableTimeDifference(activity,conversation.getLatestMessage().getTimeSent()));
 		ImageView profilePicture = (ImageView) view.findViewById(R.id.conversation_image);
 		loadAvatar(conversation,profilePicture);