diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-04 15:35:22 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-12-04 20:17:32 +0100 |
| commit | ced86f8990f4f89c7acbc3817b270ca8b7a61f43 (patch) | |
| tree | 7ebc022ca8da0c07845c96a0d130aaf57bd772d0 /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 81879aa82dc8ac811864fa39a7a9d1b3a16cfab1 (diff) | |
avoid some NPEs
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 45db9f2d6..6391241ec 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -365,7 +365,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa break; case Message.ENCRYPTION_AXOLOTL: AxolotlService axolotlService = conversation.getAccount().getAxolotlService(); - if (axolotlService.trustedSessionVerified(conversation)) { + if (axolotlService != null && axolotlService.trustedSessionVerified(conversation)) { mEditMessage.setHint(getString(R.string.send_omemo_x509_message)); } else { mEditMessage.setHint(getString(R.string.send_omemo_message)); |