aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-18 17:13:36 +0100
committersteckbrief <steckbrief@chefmail.de>2016-03-18 17:13:36 +0100
commitf5b684ab6b061cd558bd161c90bcea2b679eb798 (patch)
tree0abf4656e534f8fcf2b2c9b3b8d65b6943bf0c23 /src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
parent74582979b3c97117fd736422f07e007b1373b9a6 (diff)
parent67586766919f5d531d610a24331c0302311f8911 (diff)
Merge branch 'master' of git.fucktheforce.de:conversations-plus
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
index e700d6e9..1bf95910 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
@@ -562,7 +562,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)));
}