narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

OTR & another.im #23

Merged
Sergei Poljanski merged 65 commits from develop into master 2024-12-09 18:42:00 +00:00
Conversation 0 Commits 65 Files changed 245 +5 -1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 948fd85a43 - Show all commits

6
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -214,6 +214,10 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
finishedMessage.setFingerprint(otrService.getFingerprint(otrSession.getRemotePublicKey()));
conversation.setLastReceivedOtrMessageId(null);
if (body.startsWith("?OTR")) {
return null;
}
return finishedMessage;
} catch (Exception e) {
conversation.resetOtrSession();
@ -671,7 +675,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
}
} else {
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": ignoring OTR message from " + from + " isForwarded=" + Boolean.toString(isForwarded) + ", isProperlyAddressed=" + Boolean.valueOf(isProperlyAddressed));
message = null;
return;
}
} else if (pgpEncrypted != null && Config.supportOpenPgp()) {
message = new Message(conversation, pgpEncrypted, Message.ENCRYPTION_PGP, status);