diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt index a6088b3df5a636e88cbbd82cb180249bd189da64..0bfa0ba75e314d5be31037d1442406cb5c19439f 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt @@ -42,9 +42,11 @@ import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader import com.bumptech.glide.util.FixedPreloadSizeProvider import de.kuschku.libquassel.connection.ConnectionState import de.kuschku.libquassel.protocol.BufferId +import de.kuschku.libquassel.protocol.Message_Type import de.kuschku.libquassel.protocol.MsgId import de.kuschku.libquassel.quassel.syncables.BufferSyncer import de.kuschku.libquassel.session.SessionManager +import de.kuschku.libquassel.util.flag.hasFlag import de.kuschku.libquassel.util.helpers.mapSwitchMap import de.kuschku.libquassel.util.helpers.value import de.kuschku.libquassel.util.irc.HostmaskHelper @@ -302,7 +304,9 @@ class MessageListFragment : ServiceBoundFragment() { isExpanded = expanded.contains(it.messageId), isMarkerLine = markerLine == it.messageId, // Do not run the emoji regex if not necessary, this saves quite a bit of performance - isEmoji = messageSettings.largerEmoji && Patterns.EMOJI.matches(it.content) + isEmoji = it.type.hasFlag(Message_Type.Plain) && + it.content.isNotBlank() && + messageSettings.largerEmoji && Patterns.EMOJI.matches(it.content) ) } }