Port upstream PR package 2: Phone Recents call start (TelegramMessenger#2304), sharp fullscreen/peek stickers (TelegramMessenger#2297), DrawingContext null-buffer guard (TelegramMessenger#2217); TelegramMessenger#2315 already present

Author: decoder-dev

CHANGELOG.md

@@ -6,6 +6,16 @@
 
 ## [Unreleased]
 
+## [v12.9.2-4036-pre]
+
+### Fixed — порт upstream-PR, пакет 2
+- **#2304 (звонки из Phone Recents):** звонок, начатый из вкладки «Недавние» системного приложения Phone, открывал чат, но сам звонок не стартовал — handle активности (`TGCA<peerId>`) не распознавался. Теперь маппится напрямую на peer и запускается.
+- **#2297 (мыльные стикеры в fullscreen/peek):** увеличенные просмотрщики (наборы стикеров, peek) больше не блюрят ожидающий thumbnail — `blurThumbnail: false` + острый апскейл превью; peek кастомных emoji 120pt → 180pt (cap по размеру экрана).
+- **#2217 (SIGSEGV DrawingContext):** guard на нулевой `imageBuffer.mutableBytes` при неудачном malloc (сверхразмерный drawingSize) — вместо segfault в memset init теперь честно фейлится.
+
+### Skipped
+- **#2315 (infinite GIF reader loop):** уже в форке — портирован ранее вместе с фиксом #2246 (zero-frame EOF → decode failure вместо вечного reopen-loop).
+
 ## [v12.9.2-4035-pre]
 
 ### Fixed — порт upstream-PR, пакет 1 (стабильность + memory safety)

submodules/Display/Source/GenerateImage.swift

@@ -638,6 +638,16 @@ public class DrawingContext {
         self.length = self.bytesPerRow * Int(scaledSize.height)
 
         self.imageBuffer = ASCGImageBuffer(length: UInt(self.length))
+        if Int(bitPattern: self.imageBuffer.mutableBytes) == 0 {
+            // malloc(length) failed (e.g. an oversized allocation from a bad
+            // drawingSize). CGContext(data: nil, ...) below would silently
+            // succeed using CG's own internal buffer, masking the failure
+            // until the later memset(self.bytes, ...) writes through this
+            // null pointer and segfaults. Fail the init instead, matching
+            // the other guarded failure paths in this initializer.
+            // (Upstream PR #2217.)
+            return nil
+        }
 
         if opaque {
             self.bitmapInfo = DeviceGraphicsContextSettings.shared.opaqueBitmapInfo

submodules/StickerPackPreviewUI/Sources/StickerPreviewControllerNode.swift

@@ -138,7 +138,7 @@ final class StickerPreviewControllerNode: ASDisplayNode, ASScrollViewDelegate {
             self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(32.0), textColor: .black)
             break
         }
-        self.imageNode.setSignal(chatMessageSticker(account: context.account, userLocation: .other, file: itemFile, small: false, onlyFullSize: false))
+        self.imageNode.setSignal(chatMessageSticker(account: context.account, userLocation: .other, file: itemFile, small: false, fetched: true, onlyFullSize: false, blurThumbnail: false))
 
         if let (layout, navigationBarHeight) = self.containerLayout {
             self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate)

submodules/StickerPeekUI/Sources/StickerPreviewPeekContent.swift

@@ -193,7 +193,7 @@ public final class StickerPreviewPeekContentNode: ASDisplayNode, PeekControllerC
                 self.animationNode = nil
             }
 
-            self.imageNode.setSignal(chatMessageSticker(account: context.account, userLocation: .other, file: file, small: false, fetched: true))
+            self.imageNode.setSignal(chatMessageSticker(account: context.account, userLocation: .other, file: file, small: false, fetched: true, onlyFullSize: false, blurThumbnail: false))
         } else if case .portal = item {
             self._ready.set(.single(true))
         }
@@ -266,7 +266,7 @@ public final class StickerPreviewPeekContentNode: ASDisplayNode, PeekControllerC
     public func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
         let boundingSize: CGSize
         if self.item.file?.isCustomEmoji == true {
-            boundingSize = CGSize(width: 120.0, height: 120.0)
+            boundingSize = CGSize(width: 180.0, height: 180.0).fitted(size)
         } else if let _ = self.additionalAnimationNode {
             boundingSize = CGSize(width: 240.0, height: 240.0).fitted(size)
         } else {

submodules/StickerResources/Sources/StickerResources.swift

@@ -261,8 +261,8 @@ public func chatMessageAnimatedStickerBackingData(postbox: Postbox, fileReferenc
 }
 
 
-public func chatMessageSticker(account: Account, userLocation: MediaResourceUserLocation, file: TelegramMediaFile, small: Bool, fetched: Bool = false, onlyFullSize: Bool = false, thumbnail: Bool = false, synchronousLoad: Bool = false, colorSpace: CGColorSpace? = nil) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
-    return chatMessageSticker(postbox: account.postbox, userLocation: userLocation, file: file, small: small, fetched: fetched, onlyFullSize: onlyFullSize, thumbnail: thumbnail, synchronousLoad: synchronousLoad, colorSpace: colorSpace)
+public func chatMessageSticker(account: Account, userLocation: MediaResourceUserLocation, file: TelegramMediaFile, small: Bool, fetched: Bool = false, onlyFullSize: Bool = false, thumbnail: Bool = false, synchronousLoad: Bool = false, colorSpace: CGColorSpace? = nil, blurThumbnail: Bool = true) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
+    return chatMessageSticker(postbox: account.postbox, userLocation: userLocation, file: file, small: small, fetched: fetched, onlyFullSize: onlyFullSize, thumbnail: thumbnail, synchronousLoad: synchronousLoad, colorSpace: colorSpace, blurThumbnail: blurThumbnail)
 }
 
 public func chatMessageStickerPackThumbnail(postbox: Postbox, resource: MediaResource, animated: Bool = false, synchronousLoad: Bool = false, nilIfEmpty: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
@@ -318,7 +318,7 @@ public func chatMessageStickerPackThumbnail(postbox: Postbox, resource: MediaRes
     }
 }
 
-public func chatMessageSticker(postbox: Postbox, userLocation: MediaResourceUserLocation, file: TelegramMediaFile, small: Bool, fetched: Bool = false, onlyFullSize: Bool = false, thumbnail: Bool = false, synchronousLoad: Bool = false, colorSpace: CGColorSpace? = nil) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
+public func chatMessageSticker(postbox: Postbox, userLocation: MediaResourceUserLocation, file: TelegramMediaFile, small: Bool, fetched: Bool = false, onlyFullSize: Bool = false, thumbnail: Bool = false, synchronousLoad: Bool = false, colorSpace: CGColorSpace? = nil, blurThumbnail: Bool = true) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
     let signal: Signal<Tuple3<Data?, Data?, Bool>, NoError>
 
     if thumbnail {
@@ -367,7 +367,7 @@ public func chatMessageSticker(postbox: Postbox, userLocation: MediaResourceUser
 
             var blurredThumbnailImage: UIImage?
             let thumbnailInset: CGFloat = 10.0
-            if let thumbnailImage = thumbnailImage {
+            if blurThumbnail, let thumbnailImage = thumbnailImage {
                 let thumbnailSize = thumbnailImage.0.size
                 var thumbnailContextSize = thumbnailSize.aspectFitted(CGSize(width: 150.0, height: 150.0))
                 let thumbnailDrawingSize = thumbnailContextSize
@@ -403,6 +403,11 @@ public func chatMessageSticker(postbox: Postbox, userLocation: MediaResourceUser
                     c.interpolationQuality = .low
                     let thumbnailScaledInset = thumbnailInset * (fittedRect.width / blurredThumbnailImage.size.width)
                     c.draw(blurredThumbnailImage.cgImage!, in: fittedRect.insetBy(dx: -thumbnailScaledInset, dy: -thumbnailScaledInset))
+                } else if let thumbnailImage = thumbnailImage, let cgImage = thumbnailImage.0.cgImage, let cgImageAlpha = thumbnailImage.1.cgImage {
+                    c.setBlendMode(.normal)
+                    c.interpolationQuality = .medium
+                    let mask = CGImage(maskWidth: cgImageAlpha.width, height: cgImageAlpha.height, bitsPerComponent: cgImageAlpha.bitsPerComponent, bitsPerPixel: cgImageAlpha.bitsPerPixel, bytesPerRow: cgImageAlpha.bytesPerRow, provider: cgImageAlpha.dataProvider!, decode: nil, shouldInterpolate: true)
+                    c.draw(cgImage.masking(mask!)!, in: fittedRect)
                 }
 
                 if let fullSizeImage = fullSizeImage, let cgImage = fullSizeImage.0.cgImage, let cgImageAlpha = fullSizeImage.1.cgImage {
@@ -420,7 +425,7 @@ public func chatMessageSticker(postbox: Postbox, userLocation: MediaResourceUser
     }
 }
 
-public func chatMessageAnimatedSticker(postbox: Postbox, userLocation: MediaResourceUserLocation, file: TelegramMediaFile, small: Bool, size: CGSize, fitzModifier: EmojiFitzModifier? = nil, fetched: Bool = false, onlyFullSize: Bool = false, thumbnail: Bool = false, synchronousLoad: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
+public func chatMessageAnimatedSticker(postbox: Postbox, userLocation: MediaResourceUserLocation, file: TelegramMediaFile, small: Bool, size: CGSize, fitzModifier: EmojiFitzModifier? = nil, fetched: Bool = false, onlyFullSize: Bool = false, thumbnail: Bool = false, synchronousLoad: Bool = false, blurThumbnail: Bool = true) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
     let signal: Signal<Tuple3<Data?, Data?, Bool>, NoError>
     if thumbnail {
         signal = chatMessageStickerThumbnailData(postbox: postbox, userLocation: userLocation, file: file, synchronousLoad: synchronousLoad)
@@ -464,7 +469,7 @@ public func chatMessageAnimatedSticker(postbox: Postbox, userLocation: MediaReso
 
             var blurredThumbnailImage: UIImage?
             let thumbnailInset: CGFloat = 10.0
-            if let thumbnailImage = thumbnailImage {
+            if blurThumbnail, let thumbnailImage = thumbnailImage {
                 let thumbnailSize = thumbnailImage.0.size
                 var thumbnailContextSize = thumbnailSize.aspectFitted(CGSize(width: 150.0, height: 150.0))
                 let thumbnailDrawingSize = thumbnailContextSize
@@ -502,6 +507,11 @@ public func chatMessageAnimatedSticker(postbox: Postbox, userLocation: MediaReso
                     let thumbnailFittedRect = CGRect(origin: CGPoint(x: fittedRect.origin.x - (thumbnailFittedSize.width - fittedRect.width) / 2.0, y: fittedRect.origin.y - (thumbnailFittedSize.height - fittedRect.height) / 2.0), size: thumbnailFittedSize)
                     let thumbnailScaledInset = thumbnailInset * (fittedRect.width / blurredThumbnailImage.size.width)
                     c.draw(blurredThumbnailImage.cgImage!, in: thumbnailFittedRect.insetBy(dx: -thumbnailScaledInset, dy: -thumbnailScaledInset))
+                } else if let thumbnailImage = thumbnailImage, let cgImage = thumbnailImage.0.cgImage, let cgImageAlpha = thumbnailImage.1.cgImage {
+                    c.setBlendMode(.normal)
+                    c.interpolationQuality = .medium
+                    let mask = CGImage(maskWidth: cgImageAlpha.width, height: cgImageAlpha.height, bitsPerComponent: cgImageAlpha.bitsPerComponent, bitsPerPixel: cgImageAlpha.bitsPerPixel, bytesPerRow: cgImageAlpha.bytesPerRow, provider: cgImageAlpha.dataProvider!, decode: nil, shouldInterpolate: true)
+                    c.draw(cgImage.masking(mask!)!, in: fittedRect)
                 }
 
                 if let fullSizeImage = fullSizeImage, let cgImage = fullSizeImage.0.cgImage, let cgImageAlpha = fullSizeImage.1.cgImage {

submodules/TelegramUI/Sources/AppDelegate.swift

@@ -2760,6 +2760,21 @@ private func extractAccountManagerState(records: AccountRecordsView<TelegramAcco
 
     func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
         if #available(iOS 10.0, *) {
+            // A call started from the iOS Phone app's Recents tab resumes as an activity whose
+            // handle carries the peer id (TGCA<id>) rather than a phone number; without this the
+            // chat opens but the call never starts (upstream PR #2304).
+            let startCallHandlePrefix = "TGCA"
+            if userActivity.activityType == NSStringFromClass(INStartCallIntent.self),
+               let handle = userActivity.userInfo?["handle"] as? String,
+               handle.hasPrefix(startCallHandlePrefix),
+               let peerIdValue = Int64(handle.dropFirst(startCallHandlePrefix.count)) {
+                let peerId = PeerId(peerIdValue)
+                if peerId.namespace == Namespaces.Peer.CloudUser {
+                    self.startCallWhenReady(accountId: nil, peerId: peerId, isVideo: false)
+                    return true
+                }
+            }
+
             var startCallContacts: [INPerson]?
             var isVideo = false
             if let startCallIntent = userActivity.interaction?.intent as? SupportedStartCallIntent {