aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2019-07-07 22:42:06 +0200
committersteckbrief <steckbrief@chefmail.de>2019-07-07 22:42:06 +0200
commit811f3b092608b7c17982823b28c950489d0345e0 (patch)
treeaac22cd7b960082752aa1b6a01fe793bf5dfb695 /src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
parentabde267e5c1abc02ef1130f5ffd058199582926d (diff)
implements FS#277: Remove 'Message merge'
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
index 15efb7921..b7e08addf 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -232,7 +232,7 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
}
if (activity.xmppConnectionService.indicateReceived()) {
- switch (message.getMergedStatus()) {
+ switch (message.getStatus()) {
case Message.STATUS_SEND_RECEIVED:
viewHolder.binding.indicatorReceived.setVisibility(View.VISIBLE);
break;