diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-19 11:08:17 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-06-20 21:03:29 +0200 |
commit | 4cc006bf3a6d1d33f940a0a7b6038701cc4aaad7 (patch) | |
tree | c7c8d55d1c0a97df053fdffa644f7529a46871ab /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
parent | 85cd21c33ef62ecffaa43dc9e19803e7679888fd (diff) |
display toast on pgp error
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 6f173ba25..1d80c066f 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -452,7 +452,12 @@ public class XmppConnectionService extends Service { getFileBackend().copyFileToPrivateStorage(message, uri); getFileBackend().updateFileParams(message); if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) { - getPgpEngine().encrypt(message, callback); + final PgpEngine pgpEngine = getPgpEngine(); + if (pgpEngine != null) { + pgpEngine.encrypt(message, callback); + } else if (callback != null){ + callback.error(R.string.unable_to_connect_to_keychain, null); + } } else { callback.success(message); } @@ -492,7 +497,12 @@ public class XmppConnectionService extends Service { try { getFileBackend().copyImageToPrivateStorage(message, uri); if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) { - getPgpEngine().encrypt(message, callback); + final PgpEngine pgpEngine = getPgpEngine(); + if (pgpEngine != null) { + pgpEngine.encrypt(message, callback); + } else if (callback != null){ + callback.error(R.string.unable_to_connect_to_keychain, null); + } } else { callback.success(message); } |