ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-09 07:41:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '87905b13f69e30908faa6ee7d287dc853f369f37'

Browse Source
This commit is contained in:
Peter 2019-04-25 21:20:11 +04:00
commit bdb433d5e3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram-iOS/ApplicationContext.swift
View File

@ -210,8 +210,12 @@ final class AuthorizedApplicationContext {
if updatedState.isActive { if updatedState.isActive {
if strongSelf.passcodeController == nil { if strongSelf.passcodeController == nil {
let presentAnimated = previousState != nil && previousState!.isActive let presentAnimated = previousState != nil && previousState!.isActive
let controller = PasscodeEntryController(context: strongSelf.context, challengeData: updatedState.challengeData, enableBiometrics: updatedState.enableBiometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: presentAnimated, lockIconInitialFrame: { 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() return CGRect()
}
})) }))
strongSelf.passcodeController = controller strongSelf.passcodeController = controller

2
Telegram-iOS/en.lproj/Localizable.strings
View File

@ -4236,6 +4236,8 @@ Unused sets are archived when you add more.";
"ChatList.UndoArchiveTitle" = "Chat Archived"; "ChatList.UndoArchiveTitle" = "Chat Archived";
"ChatList.UndoArchiveText" = "Muted chats will stay archived after new messages arrive."; "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"; "ChatList.ArchivedChatsTitle" = "Archived Chats";
"PasscodeSettings.PasscodeOptions" = "Passcode Options"; "PasscodeSettings.PasscodeOptions" = "Passcode Options";