mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-23 06:35:51 +00:00
Various improvements
This commit is contained in:
@@ -1044,8 +1044,19 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur
|
||||
|
||||
let _ = (settings
|
||||
|> deliverOnMainQueue).startStandalone(next: { settings in
|
||||
if settings.defaultWebBrowser == nil {
|
||||
if isCompact && context.sharedContext.immediateExperimentalUISettings.browserExperiment {
|
||||
if let defaultWebBrowser = settings.defaultWebBrowser, defaultWebBrowser != "inApp" {
|
||||
let openInOptions = availableOpenInOptions(context: context, item: .url(url: url))
|
||||
if let option = openInOptions.first(where: { $0.identifier == settings.defaultWebBrowser }) {
|
||||
if case let .openUrl(url) = option.action() {
|
||||
context.sharedContext.applicationBindings.openUrl(url)
|
||||
} else {
|
||||
context.sharedContext.applicationBindings.openUrl(url)
|
||||
}
|
||||
} else {
|
||||
context.sharedContext.applicationBindings.openUrl(url)
|
||||
}
|
||||
} else {
|
||||
if settings.defaultWebBrowser == nil && isCompact {
|
||||
let controller = BrowserScreen(context: context, subject: .webPage(url: parsedUrl.absoluteString))
|
||||
navigationController?.pushViewController(controller)
|
||||
} else {
|
||||
@@ -1058,17 +1069,6 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur
|
||||
context.sharedContext.applicationBindings.openUrl(parsedUrl.absoluteString)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
let openInOptions = availableOpenInOptions(context: context, item: .url(url: url))
|
||||
if let option = openInOptions.first(where: { $0.identifier == settings.defaultWebBrowser }) {
|
||||
if case let .openUrl(url) = option.action() {
|
||||
context.sharedContext.applicationBindings.openUrl(url)
|
||||
} else {
|
||||
context.sharedContext.applicationBindings.openUrl(url)
|
||||
}
|
||||
} else {
|
||||
context.sharedContext.applicationBindings.openUrl(url)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user