diff options
| author | fiaxh <github@lightrise.org> | 2015-10-15 23:27:12 +0100 |
|---|---|---|
| committer | fiaxh <github@lightrise.org> | 2015-10-28 20:57:15 +0000 |
| commit | 016a57f123dad15b4dabce320759f29155a150a5 (patch) | |
| tree | 6f65a0386ba395b82dca0d94ddeee69903d6f8a9 | |
| parent | 29a849cb92c0dc902acd3aa54d0d2f07583bce72 (diff) | |
Show PGP "please wait" message only when actually decrypting
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 6 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
2 files changed, 7 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 d9fea817..ec7ff73d 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -550,7 +550,11 @@ public class MessageAdapter extends ArrayAdapter<Message> { } } else if (message.getEncryption() == Message.ENCRYPTION_PGP) { if (activity.hasPgp()) { - displayInfoMessage(viewHolder,activity.getString(R.string.encrypted_message),darkBackground); + if (account.getPgpDecryptionService().isRunning()) { + displayInfoMessage(viewHolder, activity.getString(R.string.message_decrypting), darkBackground); + } else { + displayInfoMessage(viewHolder, activity.getString(R.string.pgp_message), darkBackground); + } } else { displayInfoMessage(viewHolder,activity.getString(R.string.install_openkeychain),darkBackground); if (viewHolder != null) { diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index c4ba759b..7ed0d386 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -30,7 +30,8 @@ <string name="minutes_ago">%d mins ago</string> <string name="unread_conversations">unread Conversations</string> <string name="sending">sending…</string> - <string name="encrypted_message">Decrypting message. Please wait…</string> + <string name="message_decrypting">Decrypting message. Please wait…</string> + <string name="pgp_message">OpenPGP encrypted message</string> <string name="nick_in_use">Nickname is already in use</string> <string name="admin">Admin</string> <string name="owner">Owner</string> |