moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 03:32:15 -05:00
Code Issues Releases Wiki Activity

properly set chat states when receiving otr status messages

Browse Source
This commit is contained in:
iNPUTmice 2015-03-21 16:43:03 +01:00
parent 99b2ef7e9d
commit c47d1e83c1
1 changed files with 1 additions and 1 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

@ -94,6 +94,7 @@ public class MessageParser extends AbstractParser implements
} else { } else {
presence = from.getResourcepart(); presence = from.getResourcepart();
} }
extractChatState(conversation, packet);
updateLastseen(packet, account, true); updateLastseen(packet, account, true);
String body = packet.getBody(); String body = packet.getBody();
if (body.matches("^\\?OTRv\\d{1,2}\\?.*")) { if (body.matches("^\\?OTRv\\d{1,2}\\?.*")) {
@ -145,7 +146,6 @@ public class MessageParser extends AbstractParser implements
finishedMessage.setRemoteMsgId(packet.getId()); finishedMessage.setRemoteMsgId(packet.getId());
finishedMessage.markable = isMarkable(packet); finishedMessage.markable = isMarkable(packet);
finishedMessage.setCounterpart(from); finishedMessage.setCounterpart(from);
extractChatState(conversation, packet);
conversation.setLastReceivedOtrMessageId(null); conversation.setLastReceivedOtrMessageId(null);
return finishedMessage; return finishedMessage;
} catch (Exception e) { } catch (Exception e) {