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

Merge pull request #1146 from BrianBlade/minor_otr_tweaks 

OTR: Fix onContactStatusChanged & dont archive OTR
This commit is contained in:
Daniel Gultsch 2015-04-25 14:09:38 +02:00
parent d07baccf97 d6443d9b2f
commit 77caf73103
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
View File

@ -182,7 +182,7 @@ public class OtrEngine extends OtrCryptoEngineImpl implements OtrEngineHost {
packet.setBody(body); packet.setBody(body);
packet.addChild("private", "urn:xmpp:carbons:2"); packet.addChild("private", "urn:xmpp:carbons:2");
packet.addChild("no-copy", "urn:xmpp:hints"); packet.addChild("no-copy", "urn:xmpp:hints");
packet.addChild("no-store", "urn:xmpp:hints"); packet.addChild("no-permanent-store", "urn:xmpp:hints");
try { try {
Jid jid = Jid.fromSessionID(session); Jid jid = Jid.fromSessionID(session);

1
src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
View File

@ -71,6 +71,7 @@ public class MessageGenerator extends AbstractGenerator {
MessagePacket packet = preparePacket(message, addDelay); MessagePacket packet = preparePacket(message, addDelay);
packet.addChild("private", "urn:xmpp:carbons:2"); packet.addChild("private", "urn:xmpp:carbons:2");
packet.addChild("no-copy", "urn:xmpp:hints"); packet.addChild("no-copy", "urn:xmpp:hints");
packet.addChild("no-permanent-store", "urn:xmpp:hints");
try { try {
packet.setBody(otrSession.transformSending(message.getBody())[0]); packet.setBody(otrSession.transformSending(message.getBody())[0]);
return packet; return packet;

20
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -36,6 +36,7 @@ import org.openintents.openpgp.util.OpenPgpServiceConnection;
import java.math.BigInteger; import java.math.BigInteger;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@ -174,13 +175,22 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
public void onContactStatusChanged(Contact contact, boolean online) { public void onContactStatusChanged(Contact contact, boolean online) {
Conversation conversation = find(getConversations(), contact); Conversation conversation = find(getConversations(), contact);
if (conversation != null) { if (conversation != null) {
if (online && contact.getPresences().size() > 1) { if (online) {
conversation.endOtrIfNeeded(); conversation.endOtrIfNeeded();
if (contact.getPresences().size() == 1) {
sendUnsentMessages(conversation);
}
} else { } else {
conversation.resetOtrSession(); if (contact.getPresences().size() >= 1) {
} if (conversation.hasValidOtrSession()) {
if (online && (contact.getPresences().size() == 1)) { String otrResource = conversation.getOtrSession().getSessionID().getUserID();
sendUnsentMessages(conversation); if (!(Arrays.asList(contact.getPresences().asStringArray()).contains(otrResource))) {
conversation.endOtrIfNeeded();
}
}
} else {
conversation.endOtrIfNeeded();
}
} }
} }
} }