diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-10-20 19:45:26 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-10-20 19:45:26 +0200 |
| commit | 59e861ee6904296cbe8dd43c4a29513c2e928981 (patch) | |
| tree | a3bf768814ece1c377caefca35bc535c758a47c5 /src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | |
| parent | 2860088f0ea1cd5753756861c71cc7c118094f32 (diff) | |
| parent | 9ec29bb1dcf664fea606105b7e700641a4b44ae4 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index 0567de06..4ea7d7cf 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -91,7 +91,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { convName.setTypeface(null, Typeface.NORMAL); } - if (message.getFileParams().width > 0 + if ((null != message.getFileParams() && message.getFileParams().getWidth() > 0) // TODO: Use FileParams.getMimeType() && (message.getTransferable() == null || message.getTransferable().getStatus() != Transferable.STATUS_DELETED)) { mLastMessage.setVisibility(View.GONE); |