diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-06 21:23:49 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-06 21:23:49 +0200 |
| commit | 1e5c64a1f569ebe8a893cdff9a4d8957849220b3 (patch) | |
| tree | 75bbcb3a1d8d40895903fb38b2a3bee008367dc7 /src/main/java/eu/siacs/conversations/xmpp | |
| parent | 6582ac6e72a1f9bf55f2f6d8457114a6426c1062 (diff) | |
| parent | b88128241eb7deb6599e946dc009fdc5dfd32974 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 3 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java | 2 |
2 files changed, 4 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 bd570d82e..42dc2989c 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -650,6 +650,9 @@ public class XmppConnection implements Runnable { } ++stanzasReceived; lastPacketReceived = SystemClock.elapsedRealtime(); + if (Config.BACKGROUND_STANZA_LOGGING && mXmppConnectionService.checkListeners()) { + Log.d(Config.LOGTAG,"[background stanza] "+element); + } return element; } diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java index 941b4b5f6..ac75a5e59 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java @@ -83,7 +83,7 @@ public class MessagePacket extends AbstractAcknowledgeableStanza { if (packet == null) { return null; } - Long timestamp = AbstractParser.getTimestamp(forwarded,null); + Long timestamp = AbstractParser.parseTimestamp(forwarded, null); return new Pair(packet,timestamp); } |