From 36033690b4c6f8b702cd77074cb7a74d0dcde5ca Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 1 Oct 2018 08:12:11 +0200 Subject: fix crashes with EmojiTextView --- .../java/de/pixart/messenger/ui/ConferenceDetailsActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java') diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java index 1b406b887..fb40500cf 100644 --- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java @@ -590,7 +590,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers } else { this.binding.mucSubject.setVisibility(View.GONE); } - this.binding.mucYourNick.setText(mucOptions.getActualNick()); + this.binding.mucYourNick.setText(EmojiWrapper.transform(mucOptions.getActualNick())); if (mucOptions.online()) { this.binding.mucMoreDetails.setVisibility(View.VISIBLE); this.binding.mucSettings.setVisibility(View.VISIBLE); @@ -704,10 +704,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers Contact contact = user.getContact(); String name = user.getName(); if (contact != null) { - binding.contactDisplayName.setText(contact.getDisplayName()); - binding.contactJid.setText((name != null ? name + " \u2022 " : "") + getStatus(user)); + binding.contactDisplayName.setText(EmojiWrapper.transform(contact.getDisplayName())); + binding.contactJid.setText((name != null ? EmojiWrapper.transform(name) + " \u2022 " : "") + getStatus(user)); } else { - binding.contactDisplayName.setText(name == null ? "" : name); + binding.contactDisplayName.setText(name == null ? "" : EmojiWrapper.transform(name)); binding.contactJid.setText(getStatus(user)); } -- cgit v1.2.3