aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-05-17 19:19:06 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-05-17 19:22:14 +0200
commitb7b25b472cf602ab07ec2ebbb05c349a6767c2da (patch)
tree48ed510139efe114460a678e3b8e011601e1b188 /src/eu/siacs/conversations/ui/ConversationFragment.java
parentfddb09885715daf744226dd7842b3830b117d3bc (diff)
receiving pgp images important bug fix
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 5336b793..b0e9d79b 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -583,7 +583,7 @@ public class ConversationFragment extends Fragment {
ConversationActivity activity = (ConversationActivity) getActivity();
if (this.conversation != null) {
for (Message message : this.conversation.getMessages()) {
- if (message.getEncryption() == Message.ENCRYPTION_PGP) {
+ if ((message.getEncryption() == Message.ENCRYPTION_PGP)&&((message.getStatus() == Message.STATUS_RECIEVED)||(message.getStatus() == Message.STATUS_SEND))) {
decryptMessage(message);
break;
}