From 076bfc4ebd89638ae407c7eb948b1bc55d53add6 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 1 Aug 2024 12:01:00 +0200 Subject: [PATCH] Various fixes --- submodules/TelegramUI/Sources/OpenUrl.swift | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/submodules/TelegramUI/Sources/OpenUrl.swift b/submodules/TelegramUI/Sources/OpenUrl.swift index 8ab2351457..d4b2515af7 100644 --- a/submodules/TelegramUI/Sources/OpenUrl.swift +++ b/submodules/TelegramUI/Sources/OpenUrl.swift @@ -1047,7 +1047,14 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur let _ = (settings |> deliverOnMainQueue).startStandalone(next: { settings in - if let defaultWebBrowser = settings.defaultWebBrowser, defaultWebBrowser != "inApp" { + var isTonSite = false + if let host = parsedUrl.host, host.lowercased().hasSuffix(".ton") { + isTonSite = true + } else if let scheme = parsedUrl.scheme, scheme.lowercased().hasPrefix("tonsite") { + isTonSite = true + } + + if let defaultWebBrowser = settings.defaultWebBrowser, defaultWebBrowser != "inApp" && !isTonSite { let openInOptions = availableOpenInOptions(context: context, item: .url(url: url)) if let option = openInOptions.first(where: { $0.identifier == settings.defaultWebBrowser }) { if case let .openUrl(openInUrl) = option.action() { @@ -1067,14 +1074,7 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur break } } - - var isTonSite = false - if let host = parsedUrl.host, host.lowercased().hasSuffix(".ton") { - isTonSite = true - } else if let scheme = parsedUrl.scheme, scheme.lowercased().hasPrefix("tonsite") { - isTonSite = true - } - + if (settings.defaultWebBrowser == nil && !isExceptedDomain) || isTonSite { let controller = BrowserScreen(context: context, subject: .webPage(url: parsedUrl.absoluteString)) navigationController?.pushViewController(controller)