From b352ca11789850a714f53c60626973320b7143ce Mon Sep 17 00:00:00 2001 From: Peter <> Date: Tue, 23 Apr 2019 13:04:36 +0400 Subject: [PATCH 1/6] Update submodules --- submodules/TelegramCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 5a84384da7..cc65a941cd 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 5a84384da7a3f7ff06183d6acc8c970996e7383e +Subproject commit cc65a941cd255594bb5b027682d667525f9564f5 From bbd6c37f73c0db73ad748c83da6f9be03b838449 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Tue, 23 Apr 2019 18:06:44 +0400 Subject: [PATCH 2/6] Update submodules --- Telegram-iOS/en.lproj/Localizable.strings | 2 ++ submodules/Display | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 2c9fc50064..b9bdd6d027 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4236,6 +4236,8 @@ Unused sets are archived when you add more."; "ChatList.UndoArchiveTitle" = "Chat Archived"; "ChatList.UndoArchiveText" = "Muted chats will stay archived after new messages arrive."; +"ChatList.UndoArchiveHiddenTitle" = "Archive Hidden"; +"ChatList.UndoArchiveHiddenText" = "Swipe down to see archive."; "ChatList.ArchivedChatsTitle" = "Archived Chats"; "PasscodeSettings.PasscodeOptions" = "Passcode Options"; diff --git a/submodules/Display b/submodules/Display index 6ae1baad94..2bf1de59b6 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 6ae1baad940abd703ccf37505c2270a8cd4fbfc6 +Subproject commit 2bf1de59b64b8c4bb43f98c8c2fd975e6661bd36 diff --git a/submodules/TelegramCore b/submodules/TelegramCore index cc65a941cd..dea70edd46 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit cc65a941cd255594bb5b027682d667525f9564f5 +Subproject commit dea70edd4649ea86b12ba00a32f24f3bd060f0e4 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 06ad876b5f..9004ffa787 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 06ad876b5f703bd8db40a10a6aaaa5cc545a229e +Subproject commit 9004ffa7871adc7426af2c4820fc11269256c1cb From 7b20461ceb76047782a32d1987cc294a371e470e Mon Sep 17 00:00:00 2001 From: Peter <> Date: Tue, 23 Apr 2019 19:05:36 +0400 Subject: [PATCH 3/6] Update submodules --- submodules/Display | 2 +- submodules/TelegramUI | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/Display b/submodules/Display index 2bf1de59b6..ca08be316e 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 2bf1de59b64b8c4bb43f98c8c2fd975e6661bd36 +Subproject commit ca08be316e0ac54187f5dac8f3ff79ad50e707d8 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 9004ffa787..7d709204f4 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 9004ffa7871adc7426af2c4820fc11269256c1cb +Subproject commit 7d709204f46f7ff30af29919e71a5c1b8835324f From 7a18514a40e4d29dfd5c7da7cc66cce7caf58692 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Tue, 23 Apr 2019 20:44:58 +0400 Subject: [PATCH 4/6] Update submodules --- submodules/Display | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Display b/submodules/Display index ca08be316e..786b0207db 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit ca08be316e0ac54187f5dac8f3ff79ad50e707d8 +Subproject commit 786b0207db1b0f02cfbca0d06ab4421646f6ba8e From 79dbf5659f866a63fb0d62b09cd96623e0851c58 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 23 Apr 2019 21:35:27 +0400 Subject: [PATCH 5/6] Update submodules --- Telegram-iOS/ApplicationContext.swift | 8 ++++++-- submodules/Display | 2 +- submodules/TelegramUI | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Telegram-iOS/ApplicationContext.swift b/Telegram-iOS/ApplicationContext.swift index 7bcdf5fbb4..5c7c2cdfe1 100644 --- a/Telegram-iOS/ApplicationContext.swift +++ b/Telegram-iOS/ApplicationContext.swift @@ -210,8 +210,12 @@ final class AuthorizedApplicationContext { if updatedState.isActive { if strongSelf.passcodeController == nil { let presentAnimated = previousState != nil && previousState!.isActive - let controller = PasscodeEntryController(context: strongSelf.context, challengeData: updatedState.challengeData, enableBiometrics: updatedState.enableBiometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: presentAnimated, lockIconInitialFrame: { - return CGRect() + let controller = PasscodeEntryController(context: strongSelf.context, challengeData: updatedState.challengeData, enableBiometrics: updatedState.enableBiometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: presentAnimated, lockIconInitialFrame: { [weak self] in + if let strongSelf = self, let lockViewFrame = strongSelf.rootController.chatListController?.lockViewFrame { + return lockViewFrame + } else { + return CGRect() + } })) strongSelf.passcodeController = controller diff --git a/submodules/Display b/submodules/Display index 786b0207db..108a074f74 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 786b0207db1b0f02cfbca0d06ab4421646f6ba8e +Subproject commit 108a074f74f7a41daa63502e061b55187adb9fbd diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 7d709204f4..2af72af585 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 7d709204f46f7ff30af29919e71a5c1b8835324f +Subproject commit 2af72af5851b34bf08eb48d668211ce61891f0c3 From 87905b13f69e30908faa6ee7d287dc853f369f37 Mon Sep 17 00:00:00 2001 From: Grishka Date: Thu, 25 Apr 2019 04:59:01 +0300 Subject: [PATCH 6/6] updated libtgvoip --- submodules/libtgvoip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/libtgvoip b/submodules/libtgvoip index a121aef1a9..9b78887eaf 160000 --- a/submodules/libtgvoip +++ b/submodules/libtgvoip @@ -1 +1 @@ -Subproject commit a121aef1a9d5c0d048bf1cf7478a1e145b542248 +Subproject commit 9b78887eafa3afbcfd405027da02d95d95fd1c8d