additional null pointer checks when verifying otr keys

This commit is contained in:
Daniel Gultsch 2016-07-17 22:02:08 +02:00
parent 3e50d4831f
commit eb3ac1c326

View File

@ -252,7 +252,7 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
} }
protected void updateView() { protected void updateView() {
if (this.mConversation.hasValidOtrSession()) { if (this.mConversation != null && this.mConversation.hasValidOtrSession()) {
final ActionBar actionBar = getActionBar(); final ActionBar actionBar = getActionBar();
this.mVerificationExplain.setText(R.string.no_otr_session_found); this.mVerificationExplain.setText(R.string.no_otr_session_found);
invalidateOptionsMenu(); invalidateOptionsMenu();