aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/adapter
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-22 13:23:35 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-22 13:23:35 +0200
commit45aede14bd7d384e8adbcd6697ba39b1dcbf77b4 (patch)
tree760d017b369aa8648c00234ad979f42f1ee6e9cb /src/eu/siacs/conversations/ui/adapter
parentbb065020ff6145adf8fb2726928f11e0ea7140b6 (diff)
fixed #452
Diffstat (limited to 'src/eu/siacs/conversations/ui/adapter')
-rw-r--r--src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index bfcba135..e40723f4 100644
--- a/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -52,7 +52,11 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
}
TextView convName = (TextView) view
.findViewById(R.id.conversation_name);
- convName.setText(conv.getName());
+ if (conv.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
+ convName.setText(conv.getName());
+ } else {
+ convName.setText(conv.getContactJid().split("/")[0]);
+ }
TextView convLastMsg = (TextView) view
.findViewById(R.id.conversation_lastmsg);
ImageView imagePreview = (ImageView) view