Merge pull request #4744 from vector-im/feature/adm/emoji-notice-fix

Emojis in emotes causing crashes on Android 12+
element-hq · Dec 17, 2021 · ac65942 · ac65942
2 parents ca58a04 + 9e2fb13
commit ac65942
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelog.d/4743.bugfix b/changelog.d/4743.bugfix
@@ -0,0 +1 @@
+Fixes crash when launching rooms which contain emojis in the emote content on android 12+
diff --git a/.../main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/.../main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -613,7 +613,7 @@ class MessageItemFactory @Inject constructor(
         val formattedBody = SpannableStringBuilder()
         formattedBody.append("* ${informationData.memberName} ")
         formattedBody.append(messageContent.getHtmlBody())
-
+        val bindingOptions = spanUtils.getBindingOptions(formattedBody)
         val message = formattedBody.linkify(callback)
 
         return MessageTextItem_()
@@ -625,6 +625,7 @@ class MessageItemFactory @Inject constructor(
                         message(message)
                     }
                 }
+                .bindingOptions(bindingOptions)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
                 .previewUrlRetriever(callback?.getPreviewUrlRetriever())
                 .imageContentRenderer(imageContentRenderer)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixes crash when launching rooms which contain emojis in the emote content on android 12+