do not call listeners while being synchronized on stanza queue

2 files changed, 20 insertions, 6 deletions

diff --git a/src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java b/src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java
index 7ff5658a8..9c123af7c 100644
--- a/src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java
+++ b/src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java
@@ -3,5 +3,5 @@ package de.pixart.messenger.xmpp;
 import de.pixart.messenger.entities.Account;
 
 public interface OnMessageAcknowledged {
-    public void onMessageAcknowledged(Account account, String id);
+    boolean onMessageAcknowledged(Account account, String id);
 }
diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
index 74577cfde..a6fe3756a 100644
--- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
@@ -603,6 +603,7 @@ public class XmppConnection implements Runnable {
                 final String h = resumed.getAttribute("h");
                 try {
                     ArrayList<AbstractAcknowledgeableStanza> failedStanzas = new ArrayList<>();
+                    final boolean acknowledgedMessages;
                     synchronized (this.mStanzaQueue) {
                         final int serverCount = Integer.parseInt(h);
                         if (serverCount < stanzasSent) {
@@ -612,12 +613,15 @@ public class XmppConnection implements Runnable {
                         } else {
                             Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": session resumed");
                         }
-                        acknowledgeStanzaUpTo(serverCount);
+                        acknowledgedMessages = acknowledgeStanzaUpTo(serverCount);
                         for (int i = 0; i < this.mStanzaQueue.size(); ++i) {
                             failedStanzas.add(mStanzaQueue.valueAt(i));
                         }
                         mStanzaQueue.clear();
                     }
+                    if (acknowledgedMessages) {
+                        mXmppConnectionService.updateConversationUi();
+                    }
                     Log.d(Config.LOGTAG, "resending " + failedStanzas.size() + " stanzas");
                     for (AbstractAcknowledgeableStanza packet : failedStanzas) {
                         if (packet instanceof MessagePacket) {
@@ -658,9 +662,13 @@ public class XmppConnection implements Runnable {
                 final Element ack = tagReader.readElement(nextTag);
                 lastPacketReceived = SystemClock.elapsedRealtime();
                 try {
+                    final boolean acknowledgedMessages;
                     synchronized (this.mStanzaQueue) {
                         final int serverSequence = Integer.parseInt(ack.getAttribute("h"));
-                        acknowledgeStanzaUpTo(serverSequence);
+                        acknowledgedMessages = acknowledgeStanzaUpTo(serverSequence);
+                    }
+                    if (acknowledgedMessages) {
+                        mXmppConnectionService.updateConversationUi();
                     }
                 } catch (NumberFormatException | NullPointerException e) {
                     Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": server send ack without sequence number");
@@ -670,8 +678,12 @@ public class XmppConnection implements Runnable {
                 try {
                     final int serverCount = Integer.parseInt(failed.getAttribute("h"));
                     Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": resumption failed but server acknowledged stanza #" + serverCount);
+                    final boolean acknowledgedMessages;
                     synchronized (this.mStanzaQueue) {
-                        acknowledgeStanzaUpTo(serverCount);
+                        acknowledgedMessages = acknowledgeStanzaUpTo(serverCount);
+                    }
+                    if (acknowledgedMessages) {
+                        mXmppConnectionService.updateConversationUi();
                     }
                 } catch (NumberFormatException | NullPointerException e) {
                     Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": resumption failed");
@@ -692,10 +704,11 @@ public class XmppConnection implements Runnable {
         }
     }
 
-    private void acknowledgeStanzaUpTo(int serverCount) {
+    private boolean acknowledgeStanzaUpTo(int serverCount) {
         if (serverCount > stanzasSent) {
             Log.e(Config.LOGTAG, "server acknowledged more stanzas than we sent. serverCount=" + serverCount + ", ourCount=" + stanzasSent);
         }
+        boolean acknowledgedMessages = false;
         for (int i = 0; i < mStanzaQueue.size(); ++i) {
             if (serverCount >= mStanzaQueue.keyAt(i)) {
                 if (Config.EXTENDED_SM_LOGGING) {
@@ -704,12 +717,13 @@ public class XmppConnection implements Runnable {
                 AbstractAcknowledgeableStanza stanza = mStanzaQueue.valueAt(i);
                 if (stanza instanceof MessagePacket && acknowledgedListener != null) {
                     MessagePacket packet = (MessagePacket) stanza;
-                    acknowledgedListener.onMessageAcknowledged(account, packet.getId());
+                    acknowledgedMessages |= acknowledgedListener.onMessageAcknowledged(account, packet.getId());
                 }
                 mStanzaQueue.removeAt(i);
                 i--;
             }
         }
+        return acknowledgedMessages;
     }
 
     private @NonNull