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

hide verify snackbar when otr session is ended. fixed npe

This commit is contained in:
iNPUTmice 2014-07-20 12:36:57 +02:00
parent 9ddd2f195e
commit 542cbef53b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/eu/siacs/conversations/entities/Conversation.java
View File

@ -291,6 +291,9 @@ public class Conversation extends AbstractEntity {
public String getOtrFingerprint() { public String getOtrFingerprint() {
if (this.otrFingerprint == null) { if (this.otrFingerprint == null) {
try { try {
if (getOtrSession()== null) {
return "";
}
DSAPublicKey remotePubKey = (DSAPublicKey) getOtrSession() DSAPublicKey remotePubKey = (DSAPublicKey) getOtrSession()
.getRemotePublicKey(); .getRemotePublicKey();
StringBuilder builder = new StringBuilder( StringBuilder builder = new StringBuilder(

1
src/eu/siacs/conversations/parser/MessageParser.java
View File

@ -80,6 +80,7 @@ public class MessageParser extends AbstractParser implements
mXmppConnectionService.onOtrSessionEstablished(conversation); mXmppConnectionService.onOtrSessionEstablished(conversation);
} else if ((before != after) && (after == SessionStatus.FINISHED)) { } else if ((before != after) && (after == SessionStatus.FINISHED)) {
conversation.resetOtrSession(); conversation.resetOtrSession();
mXmppConnectionService.updateConversationUi();
} }
if ((body == null) || (body.isEmpty())) { if ((body == null) || (body.isEmpty())) {
return null; return null;