diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-07-17 22:02:08 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-07-25 19:44:16 +0200 |
| commit | b455204630a35e904a96e773826cb25ad9c919de (patch) | |
| tree | 4019e9efc33accd662c127c0d331b33c5b2a135f /src/main | |
| parent | 89b7f8c65a4fc1e207e3ae9f6d37a878ebda5d8d (diff) | |
additional null pointer checks when verifying otr keys
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | 2 |
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 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(); |