mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Fix double-remove crash

Browse source 
(cherry picked from commit edcd8fa92d74f1f89c9440d9e1b10bdf5cea4fbe)
This commit is contained in:
Stephen Paul Weber 2024-10-15 10:32:00 -05:00 • committed by Arne
parent 5ac185a167
commit 211b1eab80
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/entities/Conversation.java
View file

@ -756,9 +756,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
if (asReaction != null) { if (asReaction != null) {
reactions.put(asReaction.first, asReaction.second); reactions.put(asReaction.first, asReaction.second);
iterator.remove(); iterator.remove();
} } else if (m.wasMergedIntoPrevious(xmppConnectionService) || (m.getSubject() != null && !m.isOOb() && (m.getRawBody() == null || m.getRawBody().length() == 0)) || (getLockThread() && !extraIds.contains(m.replyId()) && (mthread == null || !mthread.getContent().equals(getThread() == null ? "" : getThread().getContent())))) {
if (m.wasMergedIntoPrevious(xmppConnectionService) || (m.getSubject() != null && !m.isOOb() && (m.getRawBody() == null || m.getRawBody().length() == 0)) || (getLockThread() && !extraIds.contains(m.replyId()) && (mthread == null || !mthread.getContent().equals(getThread() == null ? "" : getThread().getContent())))) {
iterator.remove(); iterator.remove();
} else if (getLockThread() && mthread != null) { } else if (getLockThread() && mthread != null) {
final var reply = m.getReply(); final var reply = m.getReply();