From eb3ac1c326faf03e4299c39544b2bb09f2ffb6fe Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 17 Jul 2016 22:02:08 +0200 Subject: [PATCH] additional null pointer checks when verifying otr keys --- src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java index 2e415d5b0..d8d02c123 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();