aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-20 12:36:57 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-20 12:36:57 +0200
commit542cbef53ba4a62405d03cd08b1a6342d5c3cddc (patch)
treea97813e6af017b6ea67b201f53d4ee74386d0693 /src
parent9ddd2f195e5e20394a5f911f397f57ab7441ebb9 (diff)
hide verify snackbar when otr session is ended. fixed npe
Diffstat (limited to 'src')
-rw-r--r--src/eu/siacs/conversations/entities/Conversation.java3
-rw-r--r--src/eu/siacs/conversations/parser/MessageParser.java1
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 e04d7bf8..83ea8931 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 60d8fc6b..1b03f4ee 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;