narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

fix stanza counting error after inline SM enable

Browse source
This commit is contained in:
Daniel Gultsch 2024-03-10 17:38:56 +01:00
parent 5183a51625
commit e5cffa11be
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -935,7 +935,8 @@ public class XmppConnection implements Runnable {
private void resetOutboundStanzaQueue() { private void resetOutboundStanzaQueue() {
synchronized (this.mStanzaQueue) { synchronized (this.mStanzaQueue) {
final List<AbstractAcknowledgeableStanza> intermediateStanzas = new ArrayList<>(); final ImmutableList.Builder<AbstractAcknowledgeableStanza> intermediateStanzasBuilder =
new ImmutableList.Builder<>();
if (Config.EXTENDED_SM_LOGGING) { if (Config.EXTENDED_SM_LOGGING) {
Log.d( Log.d(
Config.LOGTAG, Config.LOGTAG,
@ -946,12 +947,13 @@ public class XmppConnection implements Runnable {
for (int i = this.stanzasSentBeforeAuthentication + 1; i <= this.stanzasSent; ++i) { for (int i = this.stanzasSentBeforeAuthentication + 1; i <= this.stanzasSent; ++i) {
final AbstractAcknowledgeableStanza stanza = this.mStanzaQueue.get(i); final AbstractAcknowledgeableStanza stanza = this.mStanzaQueue.get(i);
if (stanza != null) { if (stanza != null) {
intermediateStanzas.add(stanza); intermediateStanzasBuilder.add(stanza);
} }
} }
this.mStanzaQueue.clear(); this.mStanzaQueue.clear();
final var intermediateStanzas = intermediateStanzasBuilder.build();
for (int i = 0; i < intermediateStanzas.size(); ++i) { for (int i = 0; i < intermediateStanzas.size(); ++i) {
this.mStanzaQueue.put(i, intermediateStanzas.get(i)); this.mStanzaQueue.append(i + 1, intermediateStanzas.get(i));
} }
this.stanzasSent = intermediateStanzas.size(); this.stanzasSent = intermediateStanzas.size();
if (Config.EXTENDED_SM_LOGGING) { if (Config.EXTENDED_SM_LOGGING) {