From aaa20df5a5389fcc14cce4f2363d67deda852802 Mon Sep 17 00:00:00 2001 From: jubb Date: Tue, 3 Aug 2021 16:43:17 +1000 Subject: [PATCH] fix: use the HttpUrl parsed URL instead because of IDN's handling of toASCII --- .../conversation/v2/messages/VisibleMessageContentView.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt index 802cc14f69..8f2410652d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt @@ -24,6 +24,7 @@ import androidx.core.text.getSpans import androidx.core.text.toSpannable import kotlinx.android.synthetic.main.view_visible_message_content.view.* import network.loki.messenger.R +import okhttp3.HttpUrl import org.session.libsession.utilities.ThemeUtil import org.session.libsession.utilities.ViewUtil import org.session.libsession.utilities.recipients.Recipient @@ -213,7 +214,7 @@ class VisibleMessageContentView : LinearLayout { // replace URLSpans with ModalURLSpans body.getSpans(0, body.length).toList().forEach { urlSpan -> - val updatedUrl = urlSpan.url.let(IDN::toASCII) + val updatedUrl = urlSpan.url.let { HttpUrl.parse(it).toString() } val replacementSpan = ModalURLSpan(updatedUrl) { url -> val activity = context as AppCompatActivity OpenURLDialog(url).show(activity.supportFragmentManager, "Open URL Dialog")