ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix BrowserScreen memory leak

Browse Source
This commit is contained in:
Isaac 2025-03-19 18:55:42 +01:00
parent 17dd059f13
commit 006b14bda7
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
submodules/BrowserUI/Sources/BrowserScreen.swift
View File

@ -582,35 +582,35 @@ public class BrowserScreen: ViewController, MinimizableController {
} }
let shareController = ShareController(context: self.context, subject: subject) let shareController = ShareController(context: self.context, subject: subject)
shareController.completed = { [weak self] peerIds in shareController.completed = { [weak self] peerIds in
guard let strongSelf = self else { guard let self else {
return return
} }
let _ = (strongSelf.context.engine.data.get( let _ = (self.context.engine.data.get(
EngineDataList( EngineDataList(
peerIds.map(TelegramEngine.EngineData.Item.Peer.Peer.init) peerIds.map(TelegramEngine.EngineData.Item.Peer.Peer.init)
) )
) )
|> deliverOnMainQueue).startStandalone(next: { [weak self] peerList in |> deliverOnMainQueue).startStandalone(next: { [weak self] peerList in
guard let strongSelf = self else { guard let self else {
return return
} }
let peers = peerList.compactMap { $0 } let peers = peerList.compactMap { $0 }
let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
let text: String let text: String
var savedMessages = false var savedMessages = false
if peerIds.count == 1, let peerId = peerIds.first, peerId == strongSelf.context.account.peerId && !isDocument { if peerIds.count == 1, let peerId = peerIds.first, peerId == self.context.account.peerId && !isDocument {
text = presentationData.strings.WebBrowser_LinkAddedToBookmarks text = presentationData.strings.WebBrowser_LinkAddedToBookmarks
savedMessages = true savedMessages = true
} else { } else {
if peers.count == 1, let peer = peers.first { if peers.count == 1, let peer = peers.first {
let peerName = peer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) let peerName = peer.id == self.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
text = isDocument ? presentationData.strings.WebBrowser_FileForwardTooltip_Chat_One(peerName).string : presentationData.strings.WebBrowser_LinkForwardTooltip_Chat_One(peerName).string text = isDocument ? presentationData.strings.WebBrowser_FileForwardTooltip_Chat_One(peerName).string : presentationData.strings.WebBrowser_LinkForwardTooltip_Chat_One(peerName).string
savedMessages = peer.id == strongSelf.context.account.peerId savedMessages = peer.id == self.context.account.peerId
} else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last { } else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last {
let firstPeerName = firstPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) let firstPeerName = firstPeer.id == self.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
let secondPeerName = secondPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) let secondPeerName = secondPeer.id == self.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
text = isDocument ? presentationData.strings.WebBrowser_FileForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).string : presentationData.strings.WebBrowser_LinkForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).string text = isDocument ? presentationData.strings.WebBrowser_FileForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).string : presentationData.strings.WebBrowser_LinkForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).string
} else if let peer = peers.first { } else if let peer = peers.first {
let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
@ -620,7 +620,7 @@ public class BrowserScreen: ViewController, MinimizableController {
} }
} }
strongSelf.controller?.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: savedMessages, text: text), elevatedLayout: false, animateInAsReplacement: true, action: { [weak self] action in self.controller?.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: savedMessages, text: text), elevatedLayout: false, animateInAsReplacement: true, action: { [weak self] action in
if savedMessages, let self, action == .info { if savedMessages, let self, action == .info {
let _ = (self.context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: self.context.account.peerId)) let _ = (self.context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: self.context.account.peerId))
|> deliverOnMainQueue).start(next: { [weak self] peer in |> deliverOnMainQueue).start(next: { [weak self] peer in

5
submodules/TelegramUI/Sources/OpenChatMessage.swift
View File

@ -255,7 +255,10 @@ func openChatMessageImpl(_ params: OpenChatMessageParams) -> Bool {
subject = .document(file: .message(message: MessageReference(params.message), media: file), canShare: canShare) subject = .document(file: .message(message: MessageReference(params.message), media: file), canShare: canShare)
} }
let controller = BrowserScreen(context: params.context, subject: subject) let controller = BrowserScreen(context: params.context, subject: subject)
controller.openDocument = { file, canShare in controller.openDocument = { [weak controller] file, canShare in
guard let controller else {
return
}
controller.dismiss() controller.dismiss()
presentDocumentPreviewController(rootController: rootController, theme: presentationData.theme, strings: presentationData.strings, postbox: params.context.account.postbox, file: file, canShare: canShare) presentDocumentPreviewController(rootController: rootController, theme: presentationData.theme, strings: presentationData.strings, postbox: params.context.account.postbox, file: file, canShare: canShare)