diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-10-01 08:12:11 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-10-01 08:12:11 +0200 |
commit | 36033690b4c6f8b702cd77074cb7a74d0dcde5ca (patch) | |
tree | cf44ff7fa7fedaaa0a73cf91e9f6296679116486 /src/main/java/de/pixart/messenger/ui/adapter | |
parent | 092926db0bdf298bb99b41ab67305c34aa960469 (diff) |
fix crashes with EmojiTextView
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/adapter')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java index 17479cf99..e99353f13 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java @@ -8,7 +8,6 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.preference.PreferenceManager; -import android.support.text.emoji.widget.EmojiTextView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -28,6 +27,7 @@ import de.pixart.messenger.entities.ListItem; import de.pixart.messenger.ui.SettingsActivity; import de.pixart.messenger.ui.XmppActivity; import de.pixart.messenger.ui.util.StyledAttributes; +import de.pixart.messenger.utils.EmojiWrapper; import de.pixart.messenger.utils.IrregularUnicodeDetector; import de.pixart.messenger.utils.UIHelper; import rocks.xmpp.addr.Jid; @@ -97,7 +97,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> { } else { viewHolder.jid.setVisibility(View.GONE); } - viewHolder.name.setText(item.getDisplayName()); + viewHolder.name.setText(EmojiWrapper.transform(item.getDisplayName())); if (tags.size() != 0) { for (ListItem.Tag tag : tags) { offline = tag.getOffline() == 1; @@ -220,7 +220,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> { } private static class ViewHolder { - private EmojiTextView name; + private TextView name; private TextView jid; private ImageView avatar; private FlowLayout tags; diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index b13ccb910..0dd5ffffa 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -839,7 +839,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie } else { viewHolder.status_message.setVisibility(View.VISIBLE); viewHolder.load_more_messages.setVisibility(View.GONE); - viewHolder.status_message.setText(message.getBody()); + viewHolder.status_message.setText(EmojiWrapper.transform(message.getBody())); boolean showAvatar; if (conversation.getMode() == Conversation.MODE_SINGLE) { showAvatar = true; |