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

Author: overtake

MODULE.bazel.lock

@@ -8,6 +8,8 @@ load("@build_bazel_rules_apple//apple:ios.bzl",
     "ios_application",
     "ios_extension",
     "ios_framework",
+    "ios_unit_test",
+    "ios_ui_test",
 )
 
 load("@build_bazel_rules_apple//apple:resources.bzl",
@@ -20,6 +22,7 @@ load("@build_bazel_rules_swift//swift:swift.bzl",
 
 load(
     "@rules_xcodeproj//xcodeproj:defs.bzl",
+    "top_level_target",
     "top_level_targets",
     "xcodeproj",
     "xcode_provisioning_profile",
@@ -493,6 +496,7 @@ associated_domains_fragment = "" if telegram_bundle_id not in official_bundle_id
     <string>applinks:t.me</string>
     <string>applinks:*.t.me</string>
     <string>webcredentials:t.me</string>
+    <string>webcredentials:telegram.org</string>
 </array>
 """
 

Telegram/BUILD

@@ -324,6 +324,7 @@ public final class AuthorizationSequenceController: NavigationController, ASAuth
                     accountManager: self.sharedContext.accountManager,
                     account: self.account,
                     passkey: passkey,
+                    foreignDatacenter: nil,
                     forcedPasswordSetupNotice: { value in
                         guard let entry = CodableEntry(ApplicationSpecificCounterNotice(value: value)) else {
                             return nil
@@ -332,7 +333,14 @@ public final class AuthorizationSequenceController: NavigationController, ASAuth
                     },
                     syncContacts: syncContacts
                 )
-                |> deliverOnMainQueue).startStrict(next: { _ in
+                |> deliverOnMainQueue).startStrict(next: { [weak self] result in
+                    guard let self else {
+                        return
+                    }
+                    if result.updatedAccount !== self.account {
+                        self.account = result.updatedAccount
+                        self.inAppPurchaseManager = InAppPurchaseManager(engine: .unauthorized(self.engine))
+                    }
                 }, error: { [weak self, weak controller] error in
                     Queue.mainQueue().async {
                         if let strongSelf = self, let controller {

submodules/AuthorizationUI/Sources/AuthorizationSequenceController.swift

@@ -157,6 +157,12 @@ public final class AuthorizationSequencePhoneEntryController: ViewController, MF
             strongSelf.account = account
             strongSelf.accountUpdated?(account)
         }
+        self.controllerNode.retryPasskey = { [weak self] in
+            guard let self else {
+                return
+            }
+            self.loadAndPresentPasskey(force: true)
+        }
 
         if let (code, name, number) = self.currentData {
             self.controllerNode.codeAndNumber = (code, name, number)
@@ -194,7 +200,11 @@ public final class AuthorizationSequencePhoneEntryController: ViewController, MF
             self.controllerNode.updateCountryCode()
         }
 
-        if #available(iOS 15.0, *) {
+        self.loadAndPresentPasskey(force: false)
+    }
+    
+    private func loadAndPresentPasskey(force: Bool) {
+        if #available(iOS 16.0, *) {
             Task { @MainActor [weak self] in
                 guard let self, let account = self.account else {
                     return
@@ -235,7 +245,11 @@ public final class AuthorizationSequencePhoneEntryController: ViewController, MF
                 let authController = ASAuthorizationController(authorizationRequests: [platformKeyRequest])
                 authController.delegate = self
                 authController.presentationContextProvider = self
-                authController.performRequests()
+                if force {
+                    authController.performRequests()
+                } else {
+                    authController.performRequests(options: [.preferImmediatelyAvailableCredentials])
+                }
             }
         }
     }
@@ -290,6 +304,12 @@ public final class AuthorizationSequencePhoneEntryController: ViewController, MF
     }
 
     public func authorizationController(controller: ASAuthorizationController, didCompleteWithError error: any Error) {
+        if (error as NSError).domain == "com.apple.AuthenticationServices.AuthorizationError" && (error as NSError).code == 1001 {
+            self.controllerNode.updateDisplayPasskeyLoginOption()
+            if let validLayout = self.validLayout {
+                self.containerLayoutUpdated(validLayout, transition: .immediate)
+            }
+        }
     }
 
     public func presentationAnchor(for controller: ASAuthorizationController) -> ASPresentationAnchor {

submodules/AuthorizationUI/Sources/AuthorizationSequencePhoneEntryController.swift

@@ -15,6 +15,7 @@ import TelegramAnimatedStickerNode
 import SolidRoundedButtonNode
 import AuthorizationUtils
 import ManagedAnimationNode
+import Markdown
 
 private final class PhoneAndCountryNode: ASDisplayNode {
     let strings: PresentationStrings
@@ -312,7 +313,7 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
     private let managedAnimationNode: ManagedPhoneAnimationNode
     private let titleNode: ASTextNode
     private let titleActivateAreaNode: AccessibilityAreaNode
-    private let noticeNode: ASTextNode
+    private let noticeNode: ImmediateTextNode
     private let noticeActivateAreaNode: AccessibilityAreaNode
     private let phoneAndCountryNode: PhoneAndCountryNode
     private let contactSyncNode: ContactSyncNode
@@ -323,6 +324,8 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
     private let tokenEventsDisposable = MetaDisposable()
     var accountUpdated: ((UnauthorizedAccount) -> Void)?
 
+    var retryPasskey: (() -> Void)?
+    
     private let debugAction: () -> Void
 
     var currentNumber: String {
@@ -405,7 +408,7 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
         self.titleActivateAreaNode = AccessibilityAreaNode()
         self.titleActivateAreaNode.accessibilityTraits = .staticText
 
-        self.noticeNode = ASTextNode()
+        self.noticeNode = ImmediateTextNode()
         self.noticeNode.maximumNumberOfLines = 0
         self.noticeNode.isUserInteractionEnabled = true
         self.noticeNode.displaysAsynchronously = false
@@ -443,6 +446,23 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
         self.addSubnode(self.managedAnimationNode)
         self.contactSyncNode.isHidden = true
 
+        self.noticeNode.highlightAttributeAction = { attributes in
+            if let _ = attributes[NSAttributedString.Key(rawValue: "URL")] {
+                return NSAttributedString.Key(rawValue: "URL")
+            } else {
+                return nil
+            }
+        }
+        self.noticeNode.tapAttributeAction = { [weak self] attributes, _ in
+            guard let self else {
+                return
+            }
+            if let _ = attributes[NSAttributedString.Key(rawValue: "URL")] as? String {
+                self.retryPasskey?()
+            }
+        }
+        self.noticeNode.linkHighlightColor = theme.list.itemAccentColor.withAlphaComponent(0.2)
+        
         self.phoneAndCountryNode.selectCountryCode = { [weak self] in
             self?.selectCountryCode?()
         }
@@ -484,7 +504,7 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
         super.didLoad()
 
         self.titleNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.debugTap(_:))))
-        #if DEBUG
+        #if DEBUG && false
         self.noticeNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.debugQrTap(_:))))
         #endif
     }
@@ -555,6 +575,28 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
         let _ = self.phoneAndCountryNode.processNumberChange(number: self.phoneAndCountryNode.phoneInputNode.number)
     }
 
+    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(
+            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),
+            linkAttribute: { url in
+                return ("URL", url)
+            }
+        )))
+        let chevronImage = generateTintedImage(image: UIImage(bundleImageName: "Item List/InlineTextRightArrow"), color: self.theme.list.itemAccentColor)
+        
+        if let range = attributedText.string.range(of: ">"), let chevronImage {
+            attributedText.addAttribute(.attachment, value: chevronImage, range: NSRange(range, in: attributedText.string))
+        }
+        
+        self.noticeNode.attributedText = attributedText
+    }
+    
     func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
         var insets = layout.insets(options: [])
         insets.top = layout.statusBarHeight ?? 20.0
@@ -576,7 +618,7 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
 
         let noticeInset: CGFloat = self.account == nil ? 32.0 : 0.0
 
-        let noticeSize = self.noticeNode.measure(CGSize(width: min(274.0 + noticeInset, maximumWidth - 28.0), height: CGFloat.greatestFiniteMagnitude))
+        let noticeSize = self.noticeNode.updateLayout(CGSize(width: min(274.0 + noticeInset, maximumWidth - 28.0), height: CGFloat.greatestFiniteMagnitude))
         let proceedHeight = self.proceedNode.updateLayout(width: maximumWidth - inset * 2.0, transition: transition)
         let proceedSize = CGSize(width: maximumWidth - inset * 2.0, height: proceedHeight)
 

submodules/AuthorizationUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift

@@ -155,8 +155,6 @@ public final class CallListController: TelegramBaseController {
         if case .navigation = self.mode {
             self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil)
         }
-
-        self.updateTabBarSearchState(ViewController.TabBarSearchState(isActive: false), transition: .immediate)
     }
 
     required public init(coder aDecoder: NSCoder) {

submodules/CallListUI/Sources/CallListController.swift

@@ -118,7 +118,6 @@ swift_library(
         "//submodules/TelegramUI/Components/ButtonComponent",
         "//submodules/TelegramUI/Components/AnimatedTextComponent",
         "//submodules/TelegramUI/Components/EdgeEffect",
-        "//submodules/TelegramUI/Components/ChatList/ChatListFilterTabContainerNode",
     ],
     visibility = [
         "//visibility:public",