From 016a57f123dad15b4dabce320759f29155a150a5 Mon Sep 17 00:00:00 2001
From: fiaxh <github@lightrise.org>
Date: Thu, 15 Oct 2015 23:27:12 +0100
Subject: [PATCH] Show PGP "please wait" message only when actually decrypting

---
 .../eu/siacs/conversations/ui/adapter/MessageAdapter.java   | 6 +++++-
 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 d9fea8170..ec7ff73dd 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 c4ba759b0..7ed0d3869 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>