aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-06-29 23:41:48 +0200
committerChristian Schneppe <christian@pix-art.de>2018-06-29 23:41:48 +0200
commitc2a5f95da78918032a4cd71aac53d0c14f69fbef (patch)
treedab94e1acee36536be92006f8b1083d10d03a2a8 /src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
parent5a148ad244705d4d7238903b37c3a46206df2521 (diff)
open/close soft keyboard in quick edit
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
index abb84a51a..11c129522 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -89,15 +89,11 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
if (conversation == null) {
return;
}
- if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
- CharSequence name = conversation.getName();
- if (name instanceof Jid) {
- viewHolder.name.setText(IrregularUnicodeDetector.style(activity, (Jid) name));
- } else {
- viewHolder.name.setText(EmojiWrapper.transform(name));
- }
+ CharSequence name = conversation.getName();
+ if (name instanceof Jid) {
+ viewHolder.name.setText(IrregularUnicodeDetector.style(activity, (Jid) name));
} else {
- viewHolder.name.setText(conversation.getJid().asBareJid().toString());
+ viewHolder.name.setText(EmojiWrapper.transform(name));
}
viewHolder.frame.setBackgroundColor(Color.get(activity, conversation == ConversationFragment.getConversation(activity) ? R.attr.color_background_secondary : R.attr.color_background_primary));