diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-02 11:21:29 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-02 11:21:29 +0100 |
| commit | ba9ba8ffe2ba3ef84ad1ed2adc57ab91e6f8fa73 (patch) | |
| tree | a0f9519950ef652a626392dce628d8a84500b450 /src/main/java/eu | |
| parent | f30df7a535bef4e79cd15cbdeffd4f5549b5c3fc (diff) | |
avoid npe when accessing the pgp connection service
Diffstat (limited to 'src/main/java/eu')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 99183dff..94af846e 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -334,7 +334,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa } public PgpEngine getPgpEngine() { - if (pgpServiceConnection.isBound()) { + if (pgpServiceConnection != null && pgpServiceConnection.isBound()) { if (this.mPgpEngine == null) { this.mPgpEngine = new PgpEngine(new OpenPgpApi( getApplicationContext(), |