sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid npe when accessing the pgp connection service

This commit is contained in:
Daniel Gultsch 2016-02-02 11:21:29 +01:00
parent f30df7a535
commit ba9ba8ffe2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -334,7 +334,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} }
public PgpEngine getPgpEngine() { public PgpEngine getPgpEngine() {
if (pgpServiceConnection.isBound()) { if (pgpServiceConnection != null && pgpServiceConnection.isBound()) {
if (this.mPgpEngine == null) { if (this.mPgpEngine == null) {
this.mPgpEngine = new PgpEngine(new OpenPgpApi( this.mPgpEngine = new PgpEngine(new OpenPgpApi(
getApplicationContext(), getApplicationContext(),