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

Roll back updating the gallery controller

Browse Source
This commit is contained in:
Ali 2021-02-18 21:20:31 +04:00
parent 615d0cfbcc
commit 20d620d630
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
submodules/GalleryUI/Sources/GalleryController.swift
View File

@ -463,6 +463,7 @@ public class GalleryController: ViewController, StandalonePresentableController
} }
} }
} }
|> take(1)
let semaphore: DispatchSemaphore? let semaphore: DispatchSemaphore?
if synchronousLoad { if synchronousLoad {
@ -486,23 +487,6 @@ public class GalleryController: ViewController, StandalonePresentableController
strongSelf.configuration = configuration strongSelf.configuration = configuration
let entries = view.entries let entries = view.entries
if let centralEntryStableId = strongSelf.centralEntryStableId {
var found = false
for i in 0 ..< entries.count {
let message = entries[i].message
if message.stableId == centralEntryStableId {
found = true
break
}
}
if !found {
strongSelf.dismiss(forceAway: true)
return
}
}
var centralEntryStableId: UInt32? var centralEntryStableId: UInt32?
loop: for i in 0 ..< entries.count { loop: for i in 0 ..< entries.count {
let message = entries[i].message let message = entries[i].message
@ -531,16 +515,14 @@ public class GalleryController: ViewController, StandalonePresentableController
strongSelf.entries = entries.reversed() strongSelf.entries = entries.reversed()
strongSelf.hasLeftEntries = view.hasLater strongSelf.hasLeftEntries = view.hasLater
strongSelf.hasRightEntries = view.hasEarlier strongSelf.hasRightEntries = view.hasEarlier
if strongSelf.centralEntryStableId == nil, let centralEntryStableId = centralEntryStableId { if let centralEntryStableId = centralEntryStableId {
strongSelf.centralEntryStableId = centralEntryStableId strongSelf.centralEntryStableId = centralEntryStableId
} }
} else { } else {
strongSelf.entries = entries strongSelf.entries = entries
strongSelf.hasLeftEntries = view.hasEarlier strongSelf.hasLeftEntries = view.hasEarlier
strongSelf.hasRightEntries = view.hasLater strongSelf.hasRightEntries = view.hasLater
if strongSelf.centralEntryStableId == nil { strongSelf.centralEntryStableId = centralEntryStableId
strongSelf.centralEntryStableId = centralEntryStableId
}
} }
if strongSelf.isViewLoaded { if strongSelf.isViewLoaded {
var items: [GalleryItem] = [] var items: [GalleryItem] = []
@ -565,17 +547,13 @@ public class GalleryController: ViewController, StandalonePresentableController
strongSelf.galleryNode.pager.replaceItems(items, centralItemIndex: centralItemIndex) strongSelf.galleryNode.pager.replaceItems(items, centralItemIndex: centralItemIndex)
if strongSelf.temporaryDoNotWaitForReady { if strongSelf.temporaryDoNotWaitForReady {
if !strongSelf.didSetReady { strongSelf.didSetReady = true
strongSelf.didSetReady = true strongSelf._ready.set(.single(true))
strongSelf._ready.set(.single(true))
}
} else { } else {
if !strongSelf.didSetReady { let ready = strongSelf.galleryNode.pager.ready() |> timeout(2.0, queue: Queue.mainQueue(), alternate: .single(Void())) |> afterNext { [weak strongSelf] _ in
let ready = strongSelf.galleryNode.pager.ready() |> timeout(2.0, queue: Queue.mainQueue(), alternate: .single(Void())) |> afterNext { [weak strongSelf] _ in strongSelf?.didSetReady = true
strongSelf?.didSetReady = true
}
strongSelf._ready.set(ready |> map { true })
} }
strongSelf._ready.set(ready |> map { true })
} }
} }
} }
@ -590,7 +568,7 @@ public class GalleryController: ViewController, StandalonePresentableController
return (true, nil) return (true, nil)
} }
semaphore?.signal() semaphore?.signal()
if process || true { if process {
Queue.mainQueue().async { Queue.mainQueue().async {
f() f()
} }