From e6198d7bf601aa73d955d42e3248b34f93af6075 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Mon, 30 May 2022 10:38:42 +0100 Subject: [PATCH] splitting url detection condition into separate branches --- .../app/features/home/room/detail/TimelineFragment.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index 98818aba92..0f4989e36d 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -1926,10 +1926,13 @@ class TimelineFragment @Inject constructor( }) if (!isManaged) { when { - url.containsRtLOverride() || (title.isValidUrl() && url.isValidUrl() && URL(title).host != URL(url).host) -> { + url.containsRtLOverride() -> { displayUrlConfirmationDialog(title.ensureEndsLeftToRight(), url.filterDirectionOverrides()) } - else -> { + title.isValidUrl() && url.isValidUrl() && URL(title).host != URL(url).host -> { + displayUrlConfirmationDialog(title.ensureEndsLeftToRight(), url) + } + else -> { openUrlInExternalBrowser(requireContext(), url) } }