From 299bfababa7e2f577aecec7d1be21e2a84e02aa7 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 18 Apr 2019 19:46:14 +0400 Subject: [PATCH] Update submodules --- Telegram-iOS/ApplicationContext.swift | 4 +++- Telegram-iOS/en.lproj/Localizable.strings | 2 ++ submodules/TelegramUI | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Telegram-iOS/ApplicationContext.swift b/Telegram-iOS/ApplicationContext.swift index bd0a4ac757..7bcdf5fbb4 100644 --- a/Telegram-iOS/ApplicationContext.swift +++ b/Telegram-iOS/ApplicationContext.swift @@ -210,7 +210,9 @@ 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, animated: presentAnimated) + let controller = PasscodeEntryController(context: strongSelf.context, challengeData: updatedState.challengeData, enableBiometrics: updatedState.enableBiometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: presentAnimated, lockIconInitialFrame: { + return CGRect() + })) strongSelf.passcodeController = controller strongSelf.unlockedStatePromise.set(.single(false)) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index a157ad90b4..6f8637753a 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4239,3 +4239,5 @@ Unused sets are archived when you add more."; "ChatList.ArchivedChatsTitle" = "Archived Chats"; "PasscodeSettings.PasscodeOptions" = "Passcode Options"; + +"Conversation.PrivateChannelTooltip" = "This channel is private"; diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 2c17ccdd7d..fe3d243272 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 2c17ccdd7d44103b0b078d83b4e04fd750bd75ec +Subproject commit fe3d243272595e140435a9ddfba17a67b3b87dce