diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-20 12:36:57 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-20 12:36:57 +0200 |
| commit | 542cbef53ba4a62405d03cd08b1a6342d5c3cddc (patch) | |
| tree | a97813e6af017b6ea67b201f53d4ee74386d0693 /src/eu/siacs/conversations | |
| parent | 9ddd2f195e5e20394a5f911f397f57ab7441ebb9 (diff) | |
hide verify snackbar when otr session is ended. fixed npe
Diffstat (limited to 'src/eu/siacs/conversations')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Conversation.java | 3 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/parser/MessageParser.java | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java index e04d7bf88..83ea8931b 100644 --- a/src/eu/siacs/conversations/entities/Conversation.java +++ b/src/eu/siacs/conversations/entities/Conversation.java @@ -291,6 +291,9 @@ public class Conversation extends AbstractEntity { public String getOtrFingerprint() { if (this.otrFingerprint == null) { try { + if (getOtrSession()== null) { + return ""; + } DSAPublicKey remotePubKey = (DSAPublicKey) getOtrSession() .getRemotePublicKey(); StringBuilder builder = new StringBuilder( diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java index 60d8fc6b4..1b03f4ee3 100644 --- a/src/eu/siacs/conversations/parser/MessageParser.java +++ b/src/eu/siacs/conversations/parser/MessageParser.java @@ -80,6 +80,7 @@ public class MessageParser extends AbstractParser implements mXmppConnectionService.onOtrSessionEstablished(conversation); } else if ((before != after) && (after == SessionStatus.FINISHED)) { conversation.resetOtrSession(); + mXmppConnectionService.updateConversationUi(); } if ((body == null) || (body.isEmpty())) { return null; |