diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-01-29 21:52:47 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-01-29 21:52:47 +0100 |
commit | 10b27820842785f02ffd5a3aca7e3cbc3e8fdb48 (patch) | |
tree | f349bdcf466068c9395c8c75d831eaf7b5b1a411 /src/main/java/de/pixart/messenger/ui | |
parent | 35025a1af20559a990ed6160875d3e98fb82e9cd (diff) |
do not explicitly request MAM archive for blocked contacts
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index bdf36c8aa..a68958ed5 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1487,7 +1487,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa } private boolean showLoadMoreMessages(final Conversation c) { - final boolean mam = hasMamSupport(c); + final boolean mam = hasMamSupport(c) && !c.getContact().isBlocked(); final MessageArchiveService service = activity.xmppConnectionService.getMessageArchiveService(); return mam && (c.getLastClearHistory().getTimestamp() != 0 || (c.countMessages() == 0 && c.messagesLoaded.get() && c.hasMessagesLeftOnServer() && !service.queryInProgress(c))); } |