Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

This commit is contained in:
Ilya Laktyushin
2018-12-20 00:10:02 +04:00
3 changed files with 8 additions and 3 deletions

2
.gitmodules vendored
View File

@@ -9,7 +9,7 @@ url=../Display.git
url = git@github.com:peter-iakovlev/HockeySDK-iOS.git
[submodule "submodules/libtgvoip"]
path = submodules/libtgvoip
url=git@github.com:peter-iakovlev/libtgvoip.git
url=git@github.com:grishka/libtgvoip.git
[submodule "submodules/lottie-ios"]
path = submodules/lottie-ios
url=git@github.com:peter-iakovlev/lottie-ios.git

View File

@@ -1239,7 +1239,12 @@ private enum QueuedWakeup: Int32 {
case let .authorized(context):
context.openUrl(url)
case let .unauthorized(context):
if let secureIdData = parseSecureIdUrl(url) {
if let proxyData = parseProxyUrl(url) {
context.rootController.view.endEditing(true)
let strings = context.applicationContext.currentPresentationData.with({ $0 }).strings
let controller = ProxyServerActionSheetController(theme: defaultPresentationTheme, strings: strings, postbox: context.account.postbox, network: context.account.network, server: proxyData, presentationData: nil)
context.rootController.currentWindow?.present(controller, on: PresentationSurfaceLevel.root, blockInteraction: false, completion: {})
} else if let secureIdData = parseSecureIdUrl(url) {
let strings = context.applicationContext.currentPresentationData.with({ $0 }).strings
let theme = context.rootController.theme
context.rootController.currentWindow?.present(standardTextAlertController(theme: AlertControllerTheme(authTheme: theme), title: nil, text: strings.Passport_NotLoggedInMessage, actions: [TextAlertAction(type: .genericAction, title: strings.Calls_NotNow, action: {