mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-24 09:42:17 -05:00
added some OTR logging
This commit is contained in:
parent
c0b3a3ff0c
commit
0ca4a33bfb
@ -517,15 +517,18 @@ public class Conversation extends AbstractEntity implements Blockable {
|
||||
return mSmp;
|
||||
}
|
||||
|
||||
public void startOtrIfNeeded() {
|
||||
if (this.otrSession != null
|
||||
&& this.otrSession.getSessionStatus() != SessionStatus.ENCRYPTED) {
|
||||
public boolean startOtrIfNeeded() {
|
||||
if (this.otrSession != null && this.otrSession.getSessionStatus() != SessionStatus.ENCRYPTED) {
|
||||
try {
|
||||
this.otrSession.startSession();
|
||||
return true;
|
||||
} catch (OtrException e) {
|
||||
this.resetOtrSession();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean endOtrIfNeeded() {
|
||||
|
@ -288,7 +288,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
|
||||
List<Conversation> conversations = getConversations();
|
||||
for (Conversation conversation : conversations) {
|
||||
if (conversation.getAccount() == account && conversation.getMode() == Conversation.MODE_SINGLE) {
|
||||
conversation.startOtrIfNeeded();
|
||||
if (!conversation.startOtrIfNeeded()) {
|
||||
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": couldn't start OTR with "+conversation.getContact().getJid()+" when needed");
|
||||
}
|
||||
sendUnsentMessages(conversation);
|
||||
}
|
||||
}
|
||||
@ -900,8 +902,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
|
||||
if (message.fixCounterpart()) {
|
||||
conversation.startOtrSession(message.getCounterpart().getResourcepart(), true);
|
||||
} else {
|
||||
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could not fix counterpart for OTR message to contact "+message.getContact().getJid());
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
Log.d(Config.LOGTAG,account.getJid().toBareJid()+" OTR session with "+message.getContact()+" is in wrong state: "+otrSession.getSessionStatus().toString());
|
||||
}
|
||||
break;
|
||||
case Message.ENCRYPTION_AXOLOTL:
|
||||
@ -946,6 +951,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
|
||||
break;
|
||||
case Message.ENCRYPTION_OTR:
|
||||
if (!conversation.hasValidOtrSession() && message.getCounterpart() != null) {
|
||||
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": create otr session without starting for "+message.getContact().getJid());
|
||||
conversation.startOtrSession(message.getCounterpart().getResourcepart(), false);
|
||||
}
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user