diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-08 20:09:44 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-08 20:09:44 +0200 |
| commit | b23f8bd472f5c6bc809dddd26dd69791c9ed7dd8 (patch) | |
| tree | 70a97b915395bc95f7e65f19bfdc033291d5d91f /src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | |
| parent | a6f0f0cb6e7d8853ba0f30d3aee5c2842304f451 (diff) | |
introduced downloadable interface. reverted some of the changes made to OTR
Diffstat (limited to '')
| -rw-r--r-- | src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index 648c6620..bfcba135 100644 --- a/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -62,10 +62,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { if (latestMessage.getType() == Message.TYPE_TEXT || latestMessage.getType() == Message.TYPE_PRIVATE) { - if (latestMessage.getEncryption() == Message.ENCRYPTION_OTR - && latestMessage.getStatus() == Message.STATUS_RECEPTION_FAILED) { - convLastMsg.setText(R.string.unable_to_decrypt_otr_message); - } else if ((latestMessage.getEncryption() != Message.ENCRYPTION_PGP) + if ((latestMessage.getEncryption() != Message.ENCRYPTION_PGP) && (latestMessage.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED)) { String body = Config.PARSE_EMOTICONS ? UIHelper .transformAsciiEmoticons(latestMessage.getBody()) |