diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index bd127d443..18cbefec3 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -662,7 +662,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke return i; } else { Message next = messages.get(i); - while (next != null && next.wasMergedIntoPrevious()) { + while (next != null) { if (uuid.equals(next.getUuid())) { return i; } @@ -1259,7 +1259,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke if (!m.isFileOrImage() && !encrypted && !m.isGeoUri() && !m.treatAsDownloadable()) { copyMessage.setVisible(true); quoteMessage.setVisible(!showError && MessageUtils.prepareQuote(m).length() > 0); - String body = m.getMergedBody().toString(); + String body = m.getBody(); if (ShareUtil.containsXmppUri(body)) { copyLink.setTitle(R.string.copy_jabber_id); copyLink.setVisible(true); @@ -1796,7 +1796,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke } } if (message != null) { - while (message.next() != null && message.next().wasMergedIntoPrevious()) { + while (message.next() != null) { message = message.next(); } return message.getUuid(); @@ -2949,7 +2949,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke } private boolean messageContainsQuery(Message m, String q) { - return m != null && m.getMergedBody().toString().toLowerCase().contains(q.toLowerCase()); + return m != null && m.getBody().toLowerCase().contains(q.toLowerCase()); } private void startPendingIntent(PendingIntent pendingIntent, int requestCode) { |