diff options
| author | lookshe <github@lookshe.org> | 2016-04-01 16:18:10 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-01 16:18:10 +0200 |
| commit | 4fcefc878838ee3975ef71550f3fe311aca403b7 (patch) | |
| tree | de0220da358d72f8f6586a0ec8b2fa3d0b761719 /src/main/java | |
| parent | 933905767c1dd647fcef93ebc0e8b47cfb93483d (diff) | |
| parent | 5f782821359280073f0a5fbdb4ebf3cc90685f42 (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | 7 |
1 files changed, 6 insertions, 1 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 b55b766b..49e35168 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -135,7 +135,12 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { notificationStatus.setVisibility(View.VISIBLE); notificationStatus.setImageResource(R.drawable.ic_notifications_paused_grey600_24dp); } else if (conversation.alwaysNotify()) { - notificationStatus.setVisibility(View.GONE); + notificationStatus.setImageResource(R.drawable.ic_notifications_grey600_24dp); + if (conversation.getMode() == Conversation.MODE_SINGLE) { + notificationStatus.setVisibility(View.GONE); + } else { + notificationStatus.setVisibility(View.VISIBLE); + } } else { notificationStatus.setVisibility(View.VISIBLE); notificationStatus.setImageResource(R.drawable.ic_notifications_none_grey600_24dp); |