sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed npe in message parser

This commit is contained in:
iNPUTmice 2015-03-06 21:14:55 +01:00
parent 16c6f8d2ff
commit 44028a547f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

@ -408,7 +408,7 @@ public class MessageParser extends AbstractParser implements
.getAttribute("id"); .getAttribute("id");
updateLastseen(packet, account, true); updateLastseen(packet, account, true);
final Message displayedMessage = mXmppConnectionService.markMessage(account, from.toBareJid(), id, Message.STATUS_SEND_DISPLAYED); final Message displayedMessage = mXmppConnectionService.markMessage(account, from.toBareJid(), id, Message.STATUS_SEND_DISPLAYED);
Message message = displayedMessage.prev(); Message message = displayedMessage == null ? null :displayedMessage.prev();
while (message != null while (message != null
&& message.getStatus() == Message.STATUS_SEND_RECEIVED && message.getStatus() == Message.STATUS_SEND_RECEIVED
&& message.getTimeSent() < displayedMessage.getTimeSent()) { && message.getTimeSent() < displayedMessage.getTimeSent()) {