aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-07-17 22:02:08 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-07-17 22:02:08 +0200
commiteb3ac1c326faf03e4299c39544b2bb09f2ffb6fe (patch)
treeee05fc37bff785f96fb204b5a9d3feb5f3f0bc66 /src
parent3e50d4831fc1cfff2fb5774cc4efdad3b35abda4 (diff)
additional null pointer checks when verifying otr keys
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
index 2e415d5b..d8d02c12 100644
--- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
@@ -252,7 +252,7 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
}
protected void updateView() {
- if (this.mConversation.hasValidOtrSession()) {
+ if (this.mConversation != null && this.mConversation.hasValidOtrSession()) {
final ActionBar actionBar = getActionBar();
this.mVerificationExplain.setText(R.string.no_otr_session_found);
invalidateOptionsMenu();