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

Author: laktyushin

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -13805,6 +13805,13 @@ Sorry for the inconvenience.";
 "Notification.StarsGift.TransferToChannel" = "%1$@ transferred a unique collectible to %2$@";
 "Notification.StarsGift.TransferToChannelYou" = "You transferred a unique collectible to %@";
 
+"Gift.Convert.Success.ChannelText" = "**%1$@** were sent to channel's balance.";
+"Gift.Convert.Success.ChannelText.Stars_1" = "%@ Star";
+"Gift.Convert.Success.ChannelText.Stars_any" = "%@ Stars";
+
+"Stars.Transfer.Terms" = "By purchasing you agree to the [Terms of Service]().";
+"Stars.Transfer.Terms_URL" = "https://telegram.org/tos/stars";
+
 "AvatarEditor.PremiumNeeded.Background" = "Subscribe to Telegram Premium to choose this background.";
 "AvatarEditor.PremiumNeeded.Emoji" = "Subscribe to Telegram Premium to choose this emoji.";
 "AvatarEditor.PremiumNeeded.Sticker" = "Subscribe to Telegram Premium to choose this sticker.";
@@ -13981,3 +13988,7 @@ Sorry for the inconvenience.";
 
 "Privacy.Review.Invite.Title" = "Invitation Settings";
 "Privacy.Review.Invite.Text" = "You've restricted who can message you, but anyone can still invite you to groups and channels. Would you like to review these settings?";
+
+"Conversation.VideoTimeLinkCopied" = "Link with start time at %@ copied to clipboard.";
+"Share.VideoStartAt" = "Start at %@";
+"SendStarReactions.SubtitleFrom" = "from %@";

build_number_offset

@@ -1 +1 @@
-2510
+2515

submodules/AccountContext/Sources/OpenChatMessage.swift

@@ -48,6 +48,7 @@ public final class OpenChatMessageParams {
     public let gallerySource: GalleryControllerItemSource?
     public let centralItemUpdated: ((MessageId) -> Void)?
     public let getSourceRect: (() -> CGRect?)?
+    public let blockInteraction: Promise<Bool>
 
     public init(
         context: AccountContext,
@@ -109,5 +110,6 @@ public final class OpenChatMessageParams {
         self.gallerySource = gallerySource
         self.centralItemUpdated = centralItemUpdated
         self.getSourceRect = getSourceRect
+        self.blockInteraction = Promise()
     }
 }

submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift

@@ -3566,12 +3566,24 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                         }
                     })
                 }, openStories: { peerId, avatarNode in
+                    guard let strongSelf = self else {
+                        return
+                    }
                     strongSelf.interaction.openStories?(peerId, avatarNode)
                 }, openPublicPosts: {
+                    guard let strongSelf = self else {
+                        return
+                    }
                     strongSelf.interaction.switchToFilter(.publicPosts)
                 }, openMessagesFilter: { sourceNode in
+                    guard let strongSelf = self else {
+                        return
+                    }
                     strongSelf.openMessagesFilter(sourceNode: sourceNode)
                 }, switchMessagesFilter: { filter in
+                    guard let strongSelf = self else {
+                        return
+                    }
                     strongSelf.searchScopePromise.set(.everywhere)
                 })
                 strongSelf.currentEntries = newEntries

submodules/DebugSettingsUI/Sources/DebugController.swift

@@ -100,7 +100,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
     case enableReactionOverrides(Bool)
     case storiesExperiment(Bool)
     case storiesJpegExperiment(Bool)
-    case playlistPlayback(Bool)
+    case conferenceDebug(Bool)
     case enableQuickReactionSwitch(Bool)
     case disableReloginTokens(Bool)
     case liveStreamV2(Bool)
@@ -133,7 +133,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
             return DebugControllerSection.web.rawValue
         case .keepChatNavigationStack, .skipReadHistory, .dustEffect, .crashOnSlowQueries, .crashOnMemoryPressure:
             return DebugControllerSection.experiments.rawValue
-        case .clearTips, .resetNotifications, .crash, .fillLocalSavedMessageCache, .resetDatabase, .resetDatabaseAndCache, .resetHoles, .resetTagHoles, .reindexUnread, .resetCacheIndex, .reindexCache, .resetBiometricsData, .optimizeDatabase, .photoPreview, .knockoutWallpaper, .storiesExperiment, .storiesJpegExperiment, .playlistPlayback, .enableQuickReactionSwitch, .experimentalCompatibility, .enableDebugDataDisplay, .rippleEffect, .browserExperiment, .localTranscription, .enableReactionOverrides, .restorePurchases, .disableReloginTokens, .liveStreamV2, .experimentalCallMute, .playerV2, .devRequests, .fakeAds, .enableLocalTranslation:
+        case .clearTips, .resetNotifications, .crash, .fillLocalSavedMessageCache, .resetDatabase, .resetDatabaseAndCache, .resetHoles, .resetTagHoles, .reindexUnread, .resetCacheIndex, .reindexCache, .resetBiometricsData, .optimizeDatabase, .photoPreview, .knockoutWallpaper, .storiesExperiment, .storiesJpegExperiment, .conferenceDebug, .enableQuickReactionSwitch, .experimentalCompatibility, .enableDebugDataDisplay, .rippleEffect, .browserExperiment, .localTranscription, .enableReactionOverrides, .restorePurchases, .disableReloginTokens, .liveStreamV2, .experimentalCallMute, .playerV2, .devRequests, .fakeAds, .enableLocalTranslation:
             return DebugControllerSection.experiments.rawValue
         case .logTranslationRecognition, .resetTranslationStates:
             return DebugControllerSection.translation.rawValue
@@ -242,7 +242,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
             return 47
         case .disableReloginTokens:
             return 48
-        case .playlistPlayback:
+        case .conferenceDebug:
             return 49
         case .enableQuickReactionSwitch:
             return 50
@@ -1308,12 +1308,12 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     })
                 }).start()
             })
-        case let .playlistPlayback(value):
-            return ItemListSwitchItem(presentationData: presentationData, title: "Playlist Playback", value: value, sectionId: self.section, style: .blocks, updated: { value in
+        case let .conferenceDebug(value):
+            return ItemListSwitchItem(presentationData: presentationData, title: "Conference Debug", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = arguments.sharedContext.accountManager.transaction ({ transaction in
                     transaction.updateSharedData(ApplicationSpecificSharedDataKeys.experimentalUISettings, { settings in
                         var settings = settings?.get(ExperimentalUISettings.self) ?? ExperimentalUISettings.defaultSettings
-                        settings.playlistPlayback = value
+                        settings.conferenceDebug = value
                         return PreferencesEntry(settings)
                     })
                 }).start()
@@ -1540,7 +1540,7 @@ private func debugControllerEntries(sharedContext: SharedAccountContext, present
             entries.append(.storiesJpegExperiment(experimentalSettings.storiesJpegExperiment))
             entries.append(.disableReloginTokens(experimentalSettings.disableReloginTokens))
         }
-        entries.append(.playlistPlayback(experimentalSettings.playlistPlayback))
+        entries.append(.conferenceDebug(experimentalSettings.conferenceDebug))
         entries.append(.enableQuickReactionSwitch(!experimentalSettings.disableQuickReaction))
         entries.append(.liveStreamV2(experimentalSettings.liveStreamV2))
         entries.append(.experimentalCallMute(experimentalSettings.experimentalCallMute))

submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift

@@ -1755,7 +1755,6 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, ASScroll
                             let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
                             let text: String
                             if let timestamp {
-                                //TODO:localize
                                 let startTimeString: String
                                 let hours = timestamp / (60 * 60)
                                 let minutes = timestamp % (60 * 60) / 60
@@ -1765,7 +1764,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, ASScroll
                                 } else {
                                     startTimeString = String(format: "%d:%02d", minutes, seconds)
                                 }
-                                text = "Link with start time at \(startTimeString) copied to clipboard."
+                                text = presentationData.strings.Conversation_VideoTimeLinkCopied(startTimeString).string
                             } else {
                                 text = presentationData.strings.Conversation_LinkCopied
                             }

submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift

@@ -1076,7 +1076,6 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
 
     private var customUnembedWhenPortrait: ((OverlayMediaItemNode) -> Bool)?
 
-    private var pictureInPictureContent: AnyObject?
     private var nativePictureInPictureContent: AnyObject?
 
     private var activePictureInPictureNavigationController: NavigationController?
@@ -1544,10 +1543,6 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                             strongSelf.videoNode?.setBaseRate(playbackRate)
                         }
                     }
-                    
-                    if strongSelf.nativePictureInPictureContent == nil {
-                        strongSelf.setupNativePictureInPicture()
-                    }
                 }
             }
             self.videoNode = videoNode
@@ -2963,19 +2958,29 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
     }
 
     @objc func pictureInPictureButtonPressed() {
-        if let currentPictureInPictureNode = self.context.sharedContext.mediaManager.currentPictureInPictureNode as? UniversalVideoGalleryItemNode, let currentItem = currentPictureInPictureNode.item, case let .message(currentMessage, _) = currentItem.contentInfo, case let .message(message, _) = self.item?.contentInfo, currentMessage.id == message.id {
-            if let controller = self.galleryController() as? GalleryController {
-                controller.dismiss(forceAway: true)
-            }
-            return
+        if self.nativePictureInPictureContent == nil {
+            self.setupNativePictureInPicture()
         }
 
-        if #available(iOS 15.0, *) {
-            if let nativePictureInPictureContent = self.nativePictureInPictureContent as? NativePictureInPictureContentImpl {
-                addAppLogEvent(postbox: self.context.account.postbox, type: "pip_btn", peerId: self.context.account.peerId)
-                nativePictureInPictureContent.beginPictureInPicture()
+        DispatchQueue.main.async { [weak self] in
+            guard let self else {
+                return
+            }
+            
+            if let currentPictureInPictureNode = self.context.sharedContext.mediaManager.currentPictureInPictureNode as? UniversalVideoGalleryItemNode, let currentItem = currentPictureInPictureNode.item, case let .message(currentMessage, _) = currentItem.contentInfo, case let .message(message, _) = self.item?.contentInfo, currentMessage.id == message.id {
+                if let controller = self.galleryController() as? GalleryController {
+                    controller.dismiss(forceAway: true)
+                }
                 return
             }
+            
+            if #available(iOS 15.0, *) {
+                if let nativePictureInPictureContent = self.nativePictureInPictureContent as? NativePictureInPictureContentImpl {
+                    addAppLogEvent(postbox: self.context.account.postbox, type: "pip_btn", peerId: self.context.account.peerId)
+                    nativePictureInPictureContent.beginPictureInPicture()
+                    return
+                }
+            }
         }
     }
 

submodules/PhotoResources/Sources/PhotoResources.swift

@@ -524,15 +524,34 @@ private func chatMessageVideoDatas(postbox: Postbox, userLocation: MediaResource
                     thumbnail = .single(decodedThumbnailData)
                 }
             } else if let thumbnailResource = thumbnailResource {
-                thumbnail = Signal { subscriber in
-                    let fetchedDisposable = fetchedMediaResource(mediaBox: postbox.mediaBox, userLocation: userLocation, userContentType: customUserContentType ?? MediaResourceUserContentType(file: fileReference.media), reference: fileReference.resourceReference(thumbnailResource), statsCategory: .video).start()
-                    let thumbnailDisposable = postbox.mediaBox.resourceData(thumbnailResource, attemptSynchronously: synchronousLoad).start(next: { next in
-                        subscriber.putNext(next.size == 0 ? nil : try? Data(contentsOf: URL(fileURLWithPath: next.path), options: []))
-                    }, error: subscriber.putError, completed: subscriber.putCompletion)
-                    
-                    return ActionDisposable {
-                        fetchedDisposable.dispose()
-                        thumbnailDisposable.dispose()
+                if autoFetchFullSizeThumbnail, let thumbnailRepresentation = thumbnailRepresentation, (thumbnailRepresentation.dimensions.width > 200 || thumbnailRepresentation.dimensions.height > 200) {
+                    thumbnail = Signal { subscriber in
+                        let fetchedDisposable = fetchedMediaResource(mediaBox: postbox.mediaBox, userLocation: userLocation, userContentType: customUserContentType ?? MediaResourceUserContentType(file: fileReference.media), reference: fileReference.resourceReference(thumbnailRepresentation.resource), statsCategory: .video).start()
+                        let thumbnailDisposable = postbox.mediaBox.resourceData(thumbnailRepresentation.resource, attemptSynchronously: synchronousLoad).start(next: { next in
+                            let data: Data? = next.size == 0 ? nil : try? Data(contentsOf: URL(fileURLWithPath: next.path), options: [])
+                            if let data {
+                                subscriber.putNext(data)
+                            } else {
+                                subscriber.putNext(nil)
+                            }
+                        }, error: subscriber.putError, completed: subscriber.putCompletion)
+                        
+                        return ActionDisposable {
+                            fetchedDisposable.dispose()
+                            thumbnailDisposable.dispose()
+                        }
+                    }
+                } else {
+                    thumbnail = Signal { subscriber in
+                        let fetchedDisposable = fetchedMediaResource(mediaBox: postbox.mediaBox, userLocation: userLocation, userContentType: customUserContentType ?? MediaResourceUserContentType(file: fileReference.media), reference: fileReference.resourceReference(thumbnailResource), statsCategory: .video).start()
+                        let thumbnailDisposable = postbox.mediaBox.resourceData(thumbnailResource, attemptSynchronously: synchronousLoad).start(next: { next in
+                            subscriber.putNext(next.size == 0 ? nil : try? Data(contentsOf: URL(fileURLWithPath: next.path), options: []))
+                        }, error: subscriber.putError, completed: subscriber.putCompletion)
+                        
+                        return ActionDisposable {
+                            fetchedDisposable.dispose()
+                            thumbnailDisposable.dispose()
+                        }
                     }
                 }
             } else {

submodules/SemanticStatusNode/BUILD

@@ -16,7 +16,8 @@ swift_library(
         "//submodules/GZip:GZip",
         "//submodules/rlottie:RLottieBinding",
         "//submodules/AppBundle:AppBundle",
-        "//submodules/ManagedAnimationNode:ManagedAnimationNode"
+        "//submodules/ManagedAnimationNode:ManagedAnimationNode",
+        "//submodules/Components/HierarchyTrackingLayer",
     ],
     visibility = [
         "//visibility:public",

submodules/SemanticStatusNode/Sources/SemanticStatusNode.swift

@@ -6,6 +6,7 @@ import SwiftSignalKit
 import RLottieBinding
 import GZip
 import AppBundle
+import HierarchyTrackingLayer
 
 public enum SemanticStatusNodeState: Equatable {
     public struct ProgressAppearance: Equatable {
@@ -90,7 +91,7 @@ private func svgPath(_ path: StaticString, scale: CGPoint = CGPoint(x: 1.0, y: 1
 }
 
 private extension SemanticStatusNodeState {
-    func context(current: SemanticStatusNodeStateContext?) -> SemanticStatusNodeStateContext {
+    func context(current: SemanticStatusNodeStateContext?, animated: Bool) -> SemanticStatusNodeStateContext {
         switch self {
         case .none, .download, .play, .pause, .customIcon:
             let icon: SemanticStatusNodeIcon
@@ -114,7 +115,7 @@ private extension SemanticStatusNodeState {
                 if current.icon == icon {
                     return current
                 } else if (current.icon == .play && icon == .pause) || (current.icon == .pause && icon == .play) {
-                    current.icon = icon
+                    current.setIcon(icon: icon, animated: animated)
                     return current
                 } else {
                     return SemanticStatusNodeIconContext(icon: icon)
@@ -376,6 +377,8 @@ public final class SemanticStatusNode: ASControlNode {
     private var stateContext: SemanticStatusNodeStateContext
     private var appearanceContext: SemanticStatusNodeAppearanceContext
 
+    private let hierarchyTrackingLayer: HierarchyTrackingLayer
+    
     private var disposable: Disposable?
     private var backgroundNodeImage: UIImage?
 
@@ -391,13 +394,16 @@ public final class SemanticStatusNode: ASControlNode {
 
     public init(backgroundNodeColor: UIColor, foregroundNodeColor: UIColor, image: Signal<(TransformImageArguments) -> DrawingContext?, NoError>? = nil, overlayForegroundNodeColor: UIColor? = nil, cutout: CGRect? = nil) {
         self.state = .none
-        self.stateContext = self.state.context(current: nil)
+        self.stateContext = self.state.context(current: nil, animated: false)
         self.appearanceContext = SemanticStatusNodeAppearanceContext(background: backgroundNodeColor, foreground: foregroundNodeColor, backgroundImage: nil, overlayForeground: overlayForegroundNodeColor, cutout: cutout)
+        self.hierarchyTrackingLayer = HierarchyTrackingLayer()
 
         super.init()
 
+        self.layer.addSublayer(self.hierarchyTrackingLayer)
+        
         self.isOpaque = false
-        self.displaysAsynchronously = true
+        self.displaysAsynchronously = false
 
         if let image {
             self.setBackgroundImage(image, size: CGSize(width: 44.0, height: 44.0))
@@ -420,7 +426,6 @@ public final class SemanticStatusNode: ASControlNode {
                 animate = true
             }
         }
-        
         if self.stateContext.isAnimating {
             animate = true
         }
@@ -449,12 +454,15 @@ public final class SemanticStatusNode: ASControlNode {
             self.hasState = true
             animated = false
         }
+        if !self.hierarchyTrackingLayer.isInHierarchy {
+            animated = false
+        }
         if self.state != state || self.appearanceContext.cutout != cutout {
             self.state = state
             let previousStateContext = self.stateContext
             let previousAppearanceContext = updateCutout ? self.appearanceContext : nil
 
-            self.stateContext = self.state.context(current: self.stateContext)
+            self.stateContext = self.state.context(current: self.stateContext, animated: animated)
             self.stateContext.requestUpdate = { [weak self] in
                 self?.setNeedsDisplay()
             }