diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-20 17:30:19 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-20 17:30:19 +0200 |
| commit | 1cf055d2fdbaa881cfc8ead6b78dc744e9dbe596 (patch) | |
| tree | 51c0a3463ff3d5f005aeb6dccf6c50d05fddab42 /src/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | beafb06b6a59649a4c314db820f5ce30be120e7c (diff) | |
not working version of otr file transfer
Diffstat (limited to '')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationFragment.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index f80f93dd1..2eac7ad0f 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -316,7 +316,9 @@ public class ConversationFragment extends Fragment { } private void displayDecryptionFailed(ViewHolder viewHolder) { - viewHolder.download_button.setVisibility(View.GONE); + if (viewHolder.download_button != null) { + viewHolder.download_button.setVisibility(View.GONE); + } viewHolder.image.setVisibility(View.GONE); viewHolder.messageBody.setVisibility(View.VISIBLE); viewHolder.messageBody @@ -525,7 +527,8 @@ public class ConversationFragment extends Fragment { } }); } else if ((item.getEncryption() == Message.ENCRYPTION_DECRYPTED) - || (item.getEncryption() == Message.ENCRYPTION_NONE)) { + || (item.getEncryption() == Message.ENCRYPTION_NONE) + || (item.getEncryption() == Message.ENCRYPTION_OTR)) { displayImageMessage(viewHolder, item); } else if (item.getEncryption() == Message.ENCRYPTION_PGP) { displayInfoMessage(viewHolder, |