From ae6be3fdc4038e4efad0846a2f261f67403abf53 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Thu, 16 Dec 2021 18:34:00 +0000 Subject: [PATCH 1/3] adding missing binding options emote content - fixes android 12+ crash when certain emojis are used within the emote content --- .../home/room/detail/timeline/factory/MessageItemFactory.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt index 22d282d567..28b2d98909 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt +++ b/vector/src/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) From 049cad7d2c979911d43315ab95e54ae60cc98ade Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Thu, 16 Dec 2021 18:37:03 +0000 Subject: [PATCH 2/3] adding changelog entry --- changelog.d/4743.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4743.bugfix diff --git a/changelog.d/4743.bugfix b/changelog.d/4743.bugfix new file mode 100644 index 0000000000..1731a3583e --- /dev/null +++ b/changelog.d/4743.bugfix @@ -0,0 +1 @@ +Fixes crash when launching rooms which contain emojis in the notice content on android 12+ \ No newline at end of file From 9e2fb1366fbb9edbaff47f04269a8f87fe567105 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 17 Dec 2021 09:22:12 +0000 Subject: [PATCH 3/3] Update changelog.d/4743.bugfix Co-authored-by: Benoit Marty --- changelog.d/4743.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/4743.bugfix b/changelog.d/4743.bugfix index 1731a3583e..645b812314 100644 --- a/changelog.d/4743.bugfix +++ b/changelog.d/4743.bugfix @@ -1 +1 @@ -Fixes crash when launching rooms which contain emojis in the notice content on android 12+ \ No newline at end of file +Fixes crash when launching rooms which contain emojis in the emote content on android 12+ \ No newline at end of file