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

laktyushin · laktyushin · commit 5d9d21e0dc46 · 2025-12-02T19:23:25.000+04:00
diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -15508,3 +15508,31 @@ Error: %8$@";
 "ChatList.Auctions.UpcomingAuction" = "Upcoming Auction";
 
 "Gift.AuctionBid.UpcomingBid" = "You placed an early bid";
+
+"Login.PhoneWithPasskeySubtitle" = "Enter your phone number\nor [log in using Passkey >](passkey)";
+"PrivacySettings.Passkey" = "Passkey";
+"Attachment.SharedAudio" = "SHARED AUDIO";
+"Attachment.FilesSearchPlaceholder" = "Search shared audio";
+"Chat.GiftPurchaseOffer.Reject" = "Reject";
+"Chat.GiftPurchaseOffer.Accept" = "Accept";
+
+"Passkeys.DeleteAlert.Title" = "Delete Passkey?";
+"Passkeys.DeleteAlert.Text" = "Once deleted, this passkey can't be used to log in.\n\nDon't forget to remove it from your password manager too.";
+"Passkeys.DeleteAlert.Action" = "Delete";
+"Passkeys.Into.Title" = "Protect your account";
+"Passkeys.Subtitle" = "Log in safely and keep your account secure.";
+"Passkeys.Into.Title0" = "Create a Passkey";
+"Passkeys.Into.Text0" = "Make a passkey to sign in easily and safely.";
+"Passkeys.Into.Title1" = "Log in with Face ID";
+"Passkeys.Into.Text1" = "Use Face ID, Touch ID, or your passcode to sign in.";
+"Passkeys.Into.Title2" = "Store Passkey Securely";
+"Passkeys.Into.Text2" = "Your passkey is safely kept in your iCloud Keychain.";
+"Passkeys.ButtonCreate" = "Create Passkey";
+"Passkeys.ButtonSkip" = "Skip";
+"Passkeys.Title" = "Passkeys";
+"Passkeys.Subtitle" = "Log in safely and keep your account secure.";
+"Passkeys.EmptyName" = "Passkey";
+"Passkeys.PasskeyCreatedPattern" = "created %@";
+"Passkeys.PasskeyCreatedAndUsedPattern" = "created %1$@ • used %2$@";
+"Passkeys.AddPasskey" = "Create Passkey";
+"Passkeys.ListFooter" = "Your passkeys are stored securely in your password manager.";
diff --git a/submodules/AccountContext/Sources/AccountContext.swift b/submodules/AccountContext/Sources/AccountContext.swift
@@ -1476,6 +1476,7 @@ public protocol SharedAccountContext: AnyObject {
     func makeNewContactScreen(context: AccountContext, peer: EnginePeer?, phoneNumber: String?, shareViaException: Bool, completion: @escaping (EnginePeer?, DeviceContactStableId?, DeviceContactExtendedData?) -> Void) -> ViewController
     
     func makeLoginEmailSetupController(context: AccountContext, blocking: Bool, emailPattern: String?, canAutoDismissIfNeeded: Bool, navigationController: NavigationController?, completion: @escaping () -> Void, dismiss: @escaping () -> Void) -> ViewController
+    func makePasskeySetupController(context: AccountContext, displaySkip: Bool, navigationController: NavigationController?, completion: @escaping () -> Void, dismiss: @escaping () -> Void) -> ViewController
         
     func navigateToCurrentCall()
     var hasOngoingCall: ValuePromise<Bool> { get }
diff --git a/submodules/AuthorizationUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift b/submodules/AuthorizationUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift
@@ -576,11 +576,10 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
     }
     
     func updateDisplayPasskeyLoginOption() {
-        //TODO:localize
         if self.account == nil {
             return
         }
-        let attributedText = NSMutableAttributedString(attributedString: parseMarkdownIntoAttributedString("Enter your phone number\nor [log in using Passkey >](passkey)", attributes: MarkdownAttributes(
+        let attributedText = NSMutableAttributedString(attributedString: parseMarkdownIntoAttributedString(self.strings.Login_PhoneWithPasskeySubtitle, attributes: MarkdownAttributes(
             body: MarkdownAttributeSet(font: Font.regular(17.0), textColor: self.theme.list.itemPrimaryTextColor),
             bold: MarkdownAttributeSet(font: Font.semibold(17.0), textColor: self.theme.list.itemPrimaryTextColor),
             link: MarkdownAttributeSet(font: Font.regular(17.0), textColor: self.theme.list.itemAccentColor),
@@ -607,7 +606,7 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
         let titleInset: CGFloat = layout.size.width > 320.0 ? 18.0 : 0.0
         let additionalBottomInset: CGFloat = layout.size.width > 320.0 ? 80.0 : 10.0
         
-        self.titleNode.attributedText = NSAttributedString(string: self.account == nil ? strings.Login_NewNumber : strings.Login_PhoneTitle, font: Font.bold(28.0), textColor: self.theme.list.itemPrimaryTextColor)
+        self.titleNode.attributedText = NSAttributedString(string: self.account == nil ? self.strings.Login_NewNumber : self.strings.Login_PhoneTitle, font: Font.bold(28.0), textColor: self.theme.list.itemPrimaryTextColor)
         self.titleActivateAreaNode.accessibilityLabel = self.titleNode.attributedText?.string ?? ""
         
         let inset: CGFloat = 24.0
diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift
@@ -137,6 +137,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
     private let dismissAutoarchiveDisposable = MetaDisposable()
     private var didSuggestAutoarchive = false
     private var didSuggestLoginEmailSetup = false
+    private var didSuggestLoginPasskeySetup = false
     
     private var presentationData: PresentationData
     private let presentationDataValue = Promise<PresentationData>()
@@ -2586,6 +2587,30 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                     return
                 }
                 
+                if values.contains(.setupPasskey) {
+                    if strongSelf.didSuggestLoginPasskeySetup {
+                        return
+                    }
+                    strongSelf.didSuggestLoginPasskeySetup = true
+                    
+                    let _ = (context.engine.notices.getServerProvidedSuggestions(reload: true)
+                    |> deliverOnMainQueue).start(next: { [weak strongSelf] currentValues in
+                        guard let strongSelf, currentValues.contains(.setupPasskey) else {
+                            return
+                        }
+                        if let navigationController = strongSelf.navigationController as? NavigationController {
+                            let controller = strongSelf.context.sharedContext.makePasskeySetupController(context: strongSelf.context, displaySkip: true, navigationController: navigationController, completion: {
+                                let _ = context.engine.notices.dismissServerProvidedSuggestion(suggestion: ServerProvidedSuggestion.setupPasskey.id).startStandalone()
+                            }, dismiss: {
+                                let _ = context.engine.notices.dismissServerProvidedSuggestion(suggestion: ServerProvidedSuggestion.setupPasskey.id).startStandalone()
+                            })
+                            navigationController.pushViewController(controller)
+                        }
+                    })
+                    
+                    return
+                }
+                
                 if strongSelf.didSuggestAutoarchive {
                     return
                 }
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift
@@ -673,12 +673,11 @@ private func privacyAndSecurityControllerEntries(
     entries.append(.twoStepVerification(presentationData.theme, presentationData.strings.PrivacySettings_TwoStepAuth, twoStepAuthString, twoStepAuthData))
     
     if displayPasskeys {
-        //TODO:localize
         var passkeysString = ""
         if let hasPasskeys = hasPasskeys {
-            passkeysString = hasPasskeys ? "On" : "Off"
+            passkeysString = hasPasskeys ? presentationData.strings.PrivacySettings_PasscodeOn : presentationData.strings.PrivacySettings_PasscodeOff
         }
-        entries.append(.passkeys(presentationData.theme, "Passkey", passkeysString))
+        entries.append(.passkeys(presentationData.theme, presentationData.strings.PrivacySettings_Passkey, passkeysString))
     }
     
     if let privacySettings = privacySettings {
@@ -1268,9 +1267,9 @@ public func privacyAndSecurityController(
     }, openPasskeys: {
         Task { @MainActor in
             let initialPasskeysData = await (passkeysDataValue.get() |> take(1)).get()
-            let passkeysScreen = await PasskeysScreen(context: context, initialPasskeysData: initialPasskeysData, passkeysDataUpdated: { passkeysData in
+            let passkeysScreen = PasskeysScreen(context: context, displaySkip: false, initialPasskeysData: initialPasskeysData, passkeysDataUpdated: { passkeysData in
                 passkeysDataValue.set(.single(passkeysData))
-            })
+            }, completion: {}, cancel: {})
             pushControllerImpl?(passkeysScreen, true)
         }
     }, openActiveSessions: {
diff --git a/submodules/TelegramCore/Sources/Suggestions.swift b/submodules/TelegramCore/Sources/Suggestions.swift
@@ -20,6 +20,7 @@ public enum ServerProvidedSuggestion: Equatable {
     case setupPhoto
     case setupLoginEmail
     case setupLoginEmailBlocking
+    case setupPasskey
     case link(id: String, url: String, title: ServerSuggestionInfo.Item.Text, subtitle: ServerSuggestionInfo.Item.Text)
     
     init?(string: String) {
@@ -56,6 +57,8 @@ public enum ServerProvidedSuggestion: Equatable {
             self = .setupLoginEmail
         case "SETUP_LOGIN_EMAIL_NOSKIP":
             self = .setupLoginEmailBlocking
+        case "SETUP_PASSKEY":
+            self = .setupPasskey
         default:
             return nil
         }
@@ -95,6 +98,8 @@ public enum ServerProvidedSuggestion: Equatable {
             return "SETUP_LOGIN_EMAIL"
         case .setupLoginEmailBlocking:
             return "SETUP_LOGIN_EMAIL_NOSKIP"
+        case .setupPasskey:
+            return "SETUP_PASSKEY"
         case let .link(id, _, _, _):
             return id
         }
diff --git a/submodules/TelegramUI/BUILD b/submodules/TelegramUI/BUILD
@@ -498,6 +498,7 @@ swift_library(
         "//submodules/TelegramUI/Components/AttachmentFileController",
         "//submodules/TelegramUI/Components/Contacts/NewContactScreen",
         "//submodules/TelegramUI/Components/Chat/ChatSendAsContextMenu",
+        "//submodules/TelegramUI/Components/Settings/PasskeysScreen",
     ] + select({
         "@build_bazel_rules_apple//apple:ios_arm64": appcenter_targets,
         "//build-system:ios_sim_arm64": [],
diff --git a/submodules/TelegramUI/Components/AttachmentFileController/Sources/AttachmentFileController.swift b/submodules/TelegramUI/Components/AttachmentFileController/Sources/AttachmentFileController.swift
@@ -207,8 +207,7 @@ private func attachmentFileControllerEntries(presentationData: PresentationData,
     case .recent:
         listTitle = presentationData.strings.Attachment_RecentlySentFiles
     case .audio:
-        //TODO:localize
-        listTitle = "SHARED AUDIO"
+        listTitle = presentationData.strings.Attachment_SharedAudio
     }
     
     if case .audio = mode {
diff --git a/submodules/TelegramUI/Components/AttachmentFileController/Sources/AttachmentFileSearchItem.swift b/submodules/TelegramUI/Components/AttachmentFileController/Sources/AttachmentFileSearchItem.swift
@@ -138,7 +138,6 @@ private final class AttachmentFileSearchItemNode: ItemListControllerSearchNode {
         transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: navigationBarHeight), size: CGSize(width: layout.size.width, height: layout.size.height - navigationBarHeight)))
         self.containerNode.containerLayoutUpdated(layout.withUpdatedSize(CGSize(width: layout.size.width, height: layout.size.height - navigationBarHeight)), navigationBarHeight: 0.0, transition: transition)
         
-        //TODO:localize
         let searchInputSize = self.searchInput.update(
             transition: .immediate,
             component: AnyComponent(
@@ -147,7 +146,7 @@ private final class AttachmentFileSearchItemNode: ItemListControllerSearchNode {
                     strings: self.presentationData.strings,
                     metrics: layout.metrics,
                     safeInsets: layout.safeInsets,
-                    placeholder: self.mode == .audio ? "Search shared audio" : self.presentationData.strings.Attachment_FilesSearchPlaceholder,
+                    placeholder: self.mode == .audio ? self.presentationData.strings.Attachment_FilesSearchPlaceholder : self.presentationData.strings.Attachment_FilesSearchPlaceholder,
                     updated: { [weak self] query in
                         guard let self else {
                             return
diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift
@@ -2844,7 +2844,6 @@ public class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewI
                         icon: .suggestedPostReject
                     )
                 ]
-                //TODO:localize
                 let (minWidth, buttonsLayout) = actionButtonsLayout(
                     item.context,
                     item.presentationData.theme,
@@ -2854,8 +2853,8 @@ public class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewI
                     ReplyMarkupMessageAttribute(
                         rows: [
                             ReplyMarkupRow(buttons: [
-                                ReplyMarkupButton(title: "Reject", titleWhenForwarded: nil, action: .callback(requiresPassword: false, data: buttonDecline)),
-                                ReplyMarkupButton(title: "Accept", titleWhenForwarded: nil, action: .callback(requiresPassword: false, data: buttonApprove))
+                                ReplyMarkupButton(title: item.presentationData.strings.Chat_GiftPurchaseOffer_Reject, titleWhenForwarded: nil, action: .callback(requiresPassword: false, data: buttonDecline)),
+                                ReplyMarkupButton(title: item.presentationData.strings.Chat_GiftPurchaseOffer_Accept, titleWhenForwarded: nil, action: .callback(requiresPassword: false, data: buttonApprove))
                             ])
                         ],
                         flags: [],
diff --git a/submodules/TelegramUI/Components/Settings/PasskeysScreen/Sources/PasskeysScreen.swift b/submodules/TelegramUI/Components/Settings/PasskeysScreen/Sources/PasskeysScreen.swift
@@ -19,17 +19,26 @@ final class PasskeysScreenComponent: Component {
     typealias EnvironmentType = ViewControllerComponentContainer.Environment
     
     let context: AccountContext
+    let displaySkip: Bool
     let initialPasskeysData: [TelegramPasskey]?
     let passkeysDataUpdated: ([TelegramPasskey]) -> Void
+    let completion: () -> Void
+    let cancel: () -> Void
     
     init(
         context: AccountContext,
+        displaySkip: Bool,
         initialPasskeysData: [TelegramPasskey]?,
-        passkeysDataUpdated: @escaping ([TelegramPasskey]) -> Void
+        passkeysDataUpdated: @escaping ([TelegramPasskey]) -> Void,
+        completion: @escaping () -> Void,
+        cancel: @escaping () -> Void
     ) {
         self.context = context
+        self.displaySkip = displaySkip
         self.initialPasskeysData = initialPasskeysData
         self.passkeysDataUpdated = passkeysDataUpdated
+        self.completion = completion
+        self.cancel = cancel
     }
     
     static func ==(lhs: PasskeysScreenComponent, rhs: PasskeysScreenComponent) -> Bool {
@@ -39,6 +48,7 @@ final class PasskeysScreenComponent: Component {
     class View: UIView, ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding {
         private var intro: ComponentView<Empty>?
         private var list: ComponentView<Empty>?
+        private var activityIndicator: UIActivityIndicatorView?
 
         private var component: PasskeysScreenComponent?
         private var environment: EnvironmentType?
@@ -159,6 +169,8 @@ final class PasskeysScreenComponent: Component {
                     authController.delegate = self
                     authController.presentationContextProvider = self
                     authController.performRequests()
+                    
+                    component.completion()
                 }
             }
         }
@@ -168,9 +180,8 @@ final class PasskeysScreenComponent: Component {
                 return
             }
             let presentationData = component.context.sharedContext.currentPresentationData.with({ $0 })
-            //TODO:localize
-            controller.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: "Delete Passkey?", text: "Once deleted, this passkey can't be used to log in.\n\nDon't forget to remove it from your password manager too.", actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {
-            }), TextAlertAction(type: .destructiveAction, title: "Delete", action: { [weak self] in
+            controller.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: environment.strings.Passkeys_DeleteAlert_Title, text: environment.strings.Passkeys_DeleteAlert_Text, actions: [TextAlertAction(type: .genericAction, title: environment.strings.Common_Cancel, action: {
+            }), TextAlertAction(type: .destructiveAction, title: environment.strings.Passkeys_DeleteAlert_Action, action: { [weak self] in
                 guard let self else {
                     return
                 }
@@ -254,12 +265,21 @@ final class PasskeysScreenComponent: Component {
                     component: AnyComponent(PasskeysScreenIntroComponent(
                         context: component.context,
                         theme: environment.theme,
+                        strings: environment.strings,
                         insets: UIEdgeInsets(top: environment.statusBarHeight + environment.navigationHeight, left: 0.0, bottom: environment.safeInsets.bottom, right: 0.0),
+                        displaySkip: component.displaySkip,
                         createPasskeyAction: { [weak self] in
                             guard let self else {
                                 return
                             }
                             self.createPasskey()
+                        },
+                        skipAction: { [weak self] in
+                            guard let self, let component = self.component else {
+                                return
+                            }
+                            component.cancel()
+                            self.environment?.controller()?.dismiss()
                         }
                     )),
                     environment: {},
@@ -337,6 +357,27 @@ final class PasskeysScreenComponent: Component {
                 }
             }
             
+            if self.passkeysData == nil {
+                let activityIndicator: UIActivityIndicatorView
+                if let current = self.activityIndicator {
+                    activityIndicator = current
+                } else {
+                    activityIndicator = UIActivityIndicatorView(style: .large)
+                    self.activityIndicator = activityIndicator
+                    self.addSubview(activityIndicator)
+                }
+                activityIndicator.tintColor = environment.theme.list.itemPrimaryTextColor
+                
+                let indicatorSize = activityIndicator.bounds.size
+                activityIndicator.frame = CGRect(origin: CGPoint(x: floor((availableSize.width - indicatorSize.width) / 2.0), y: floor((availableSize.height - indicatorSize.height) / 2.0)), size: indicatorSize)
+                if !activityIndicator.isAnimating {
+                    activityIndicator.startAnimating()
+                }
+            } else if let activityIndicator = self.activityIndicator {
+                self.activityIndicator = nil
+                activityIndicator.removeFromSuperview()
+            }
+            
             return availableSize
         }
     }
@@ -353,10 +394,10 @@ final class PasskeysScreenComponent: Component {
 public final class PasskeysScreen: ViewControllerComponentContainer {
     private let context: AccountContext
     
-    public init(context: AccountContext, initialPasskeysData: [TelegramPasskey]?, passkeysDataUpdated: @escaping ([TelegramPasskey]) -> Void) async {
+    public init(context: AccountContext, displaySkip: Bool, initialPasskeysData: [TelegramPasskey]?, passkeysDataUpdated: @escaping ([TelegramPasskey]) -> Void, completion: @escaping () -> Void, cancel: @escaping () -> Void) {
         self.context = context
         
-        super.init(context: context, component: PasskeysScreenComponent(context: context, initialPasskeysData: initialPasskeysData, passkeysDataUpdated: passkeysDataUpdated), navigationBarAppearance: .transparent)
+        super.init(context: context, component: PasskeysScreenComponent(context: context, displaySkip: displaySkip, initialPasskeysData: initialPasskeysData, passkeysDataUpdated: passkeysDataUpdated, completion: completion, cancel: cancel), navigationBarAppearance: .transparent)
     }
     
     required public init(coder aDecoder: NSCoder) {
diff --git a/submodules/TelegramUI/Components/Settings/PasskeysScreen/Sources/PasskeysScreenIntroComponent.swift b/submodules/TelegramUI/Components/Settings/PasskeysScreen/Sources/PasskeysScreenIntroComponent.swift
diff --git a/submodules/TelegramUI/Components/Settings/PasskeysScreen/Sources/PasskeysScreenListComponent.swift b/submodules/TelegramUI/Components/Settings/PasskeysScreen/Sources/PasskeysScreenListComponent.swift
diff --git a/submodules/TelegramUI/Sources/SharedAccountContext.swift b/submodules/TelegramUI/Sources/SharedAccountContext.swift

Original file line number	Diff line number	Diff line change
`@@ -207,8 +207,7 @@ private func attachmentFileControllerEntries(presentationData: PresentationData,`
`207`	`207`	`case .recent:`
`208`	`208`	`listTitle = presentationData.strings.Attachment_RecentlySentFiles`
`209`	`209`	`case .audio:`
`210`		`- //TODO:localize`
`211`		`- listTitle = "SHARED AUDIO"`
	`210`	`+ listTitle = presentationData.strings.Attachment_SharedAudio`
`212`	`211`	`}`
`213`	`212`
`214`	`213`	`if case .audio = mode {`