diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 02:14:45 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 02:14:45 +0100 |
| commit | c9b7ed3d3f6cde5e78bf0fa7a77eae81f13cbc09 (patch) | |
| tree | 84fcd6dca2e2b1904eca61fad16a85e465b87fae /src/main/java/eu/siacs/conversations/ui | |
| parent | 98e61f189c5f8bce7a001997fa2352c0c27f2778 (diff) | |
| parent | d89d7a300058e87a4dbf1b1f5b3fe9275ebcb2ae (diff) | |
Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 3c45792f..3828e957 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -568,7 +568,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa copyUrl.setVisible(true); } if ((m.getType() == Message.TYPE_TEXT && t == null && m.treatAsDownloadable() != Message.Decision.NEVER) - || (m.isFileOrImage() && t instanceof TransferablePlaceholder && m.hasFileOnRemoteHost())){ + || (t instanceof TransferablePlaceholder && m.hasFileOnRemoteHost())){ downloadFile.setVisible(true); downloadFile.setTitle(activity.getString(R.string.download_x_file,UIHelper.getFileDescriptionString(activity, m))); } |