diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-18 17:13:36 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-18 17:13:36 +0100 |
| commit | f5b684ab6b061cd558bd161c90bcea2b679eb798 (patch) | |
| tree | 0abf4656e534f8fcf2b2c9b3b8d65b6943bf0c23 /src/main/java/de/thedevstack/conversationsplus/ui | |
| parent | 74582979b3c97117fd736422f07e007b1373b9a6 (diff) | |
| parent | 67586766919f5d531d610a24331c0302311f8911 (diff) | |
Merge branch 'master' of git.fucktheforce.de:conversations-plus
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java | 2 | ||||
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java | 2 |
2 files changed, 2 insertions, 2 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))); } diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java index d3086d66..bd3dd684 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java @@ -742,7 +742,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU Presence.Status s = p == null ? Presence.Status.OFFLINE : p.getStatus(); if (contact.showInRoster() && contact.match(needle) && (!this.mHideOfflineContacts - || (needle != null && !needle.trim().isEmpty()) + || (needle != null && !needle.isEmpty()) || s.compareTo(Presence.Status.OFFLINE) < 0)) { this.contacts.add(contact); } |