From a930900c0f2d1376900736d4a397ce75e3cd10dd Mon Sep 17 00:00:00 2001 From: Peter <> Date: Wed, 19 Dec 2018 18:51:11 +0300 Subject: [PATCH 1/3] Update submodule --- submodules/TelegramUI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramUI b/submodules/TelegramUI index f8bee27599..138e1f2984 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit f8bee2759931fd4b1c094dc0135b6ffba5667a6a +Subproject commit 138e1f298496a1dc70aa3b3fdd8f4ecf075e9d29 From e4383a9c9df923f5e42fa470cfc673fc3fe66fec Mon Sep 17 00:00:00 2001 From: Peter <> Date: Wed, 19 Dec 2018 20:34:21 +0300 Subject: [PATCH 2/3] Update submodules --- .gitmodules | 2 +- Telegram-iOS/AppDelegate.swift | 7 ++++++- submodules/MtProtoKit | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7e8bfb8f81..8616cb54f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift index 0591af6d8f..7d0e8fab9f 100644 --- a/Telegram-iOS/AppDelegate.swift +++ b/Telegram-iOS/AppDelegate.swift @@ -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: { diff --git a/submodules/MtProtoKit b/submodules/MtProtoKit index cc97fc2fa2..a7e2581217 160000 --- a/submodules/MtProtoKit +++ b/submodules/MtProtoKit @@ -1 +1 @@ -Subproject commit cc97fc2fa2a6fd875c2af18cbad65a365e9ffdd0 +Subproject commit a7e2581217adaadb0dbe3aa9c94c243facd7f16f diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 99e75d0f2d..13708dc151 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 99e75d0f2dc4f76deff6689ff9dd6b848b8312e9 +Subproject commit 13708dc151b303c016ae20318e044be5dbce0a6b diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 138e1f2984..3841061c98 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 138e1f298496a1dc70aa3b3fdd8f4ecf075e9d29 +Subproject commit 3841061c98a8207234c85971631ff3af6b4f33b0 From c3fa1ad0996b289526360a43f4ddafebb12682fc Mon Sep 17 00:00:00 2001 From: Peter <> Date: Wed, 19 Dec 2018 22:54:21 +0300 Subject: [PATCH 3/3] Update submodules --- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- submodules/libtgvoip | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 13708dc151..98767051c5 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 13708dc151b303c016ae20318e044be5dbce0a6b +Subproject commit 98767051c506be81ce802194738fe295766de391 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 3841061c98..e1958e9a5f 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 3841061c98a8207234c85971631ff3af6b4f33b0 +Subproject commit e1958e9a5f0c8aae13a323bdeb97939f236582d4 diff --git a/submodules/libtgvoip b/submodules/libtgvoip index a7546d438a..fed3bb73ee 160000 --- a/submodules/libtgvoip +++ b/submodules/libtgvoip @@ -1 +1 @@ -Subproject commit a7546d438afef9f7ce5212b36b106e1d8acb35bc +Subproject commit fed3bb73ee58beb8713ae92d3d9d0e496d88f96c