diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-13 13:32:14 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-06-13 13:32:14 +0200 |
| commit | 587fb3cca327a3422c3fc7bfd7f16dcf8b33487d (patch) | |
| tree | 3153431f80fd4ea7c8c6630c3c9d2f0586d2fcdc /src/main/java/eu/siacs/conversations/ui/adapter | |
| parent | 490a1ca3cf0a13041f51a8cdecb7cadcaf969fbe (diff) | |
refactored pgp decryption
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index e174401d..56517e3b 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -631,8 +631,8 @@ public class MessageAdapter extends ArrayAdapter<Message> { displayOpenableMessage(viewHolder, message); } } else if (message.getEncryption() == Message.ENCRYPTION_PGP) { - if (activity.hasPgp()) { - if (account.getPgpDecryptionService().isRunning()) { + if (account.isPgpDecryptionServiceConnected()) { + if (!account.hasPendingPgpIntent(conversation)) { displayInfoMessage(viewHolder, activity.getString(R.string.message_decrypting), darkBackground); } else { displayInfoMessage(viewHolder, activity.getString(R.string.pgp_message), darkBackground); |