diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-05-25 11:15:14 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-05-25 11:15:14 +0200 |
| commit | f5796024567ff8cf605971ef93d23be792229af3 (patch) | |
| tree | 3023e9a64794edf9b0dc3cf4a3096a95e5240dda /src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | |
| parent | 9d1a8c607fbd8b784f2cfdc6817938e03b3de093 (diff) | |
| parent | 4cb49c4a9cf8c0bc3f38e6bac849b9dc0d55c63c (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 9bda3c09..d52ebee5 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -921,7 +921,7 @@ public class XmppConnection implements Runnable { ++stanzasSent; } tagWriter.writeStanzaAsync(packet); - if (packet instanceof MessagePacket && packet.getId() != null && this.streamId != null) { + if (packet instanceof MessagePacket && packet.getId() != null && getFeatures().sm()) { if (Config.EXTENDED_SM_LOGGING) { Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": requesting ack for message stanza #" + stanzasSent); } |