aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-07 11:51:16 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-07 11:51:16 +0200
commit7f524352730edc630697c693a040ca570cbcedb3 (patch)
treeacd863afeec6af136e368bfbd1ea70b7bad8a4de /src/eu
parentb6f5e4a217e3eaf6be94bc5efae41273d27944bc (diff)
fixed regression of not showing status message
Diffstat (limited to 'src/eu')
-rw-r--r--src/eu/siacs/conversations/ui/adapter/MessageAdapter.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index c8dd1f0e3..25df83966 100644
--- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -417,7 +417,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
viewHolder = (ViewHolder) view.getTag();
}
- if (type == STATUS || type == NULL) {
+ if (type == STATUS) {
+ return view;
+ }
+ if (type == NULL) {
if (position == getCount() - 1) {
view.getLayoutParams().height = 1;
} else {