mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-08-07 08:01:10 +00:00
Merge commit 'a6da31108967ed94d0ece130fb35a75060dd1470'
This commit is contained in:
commit
5a23095412
@ -627,8 +627,6 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr
|
|||||||
entries.insert(previousFirstEntry, at: index)
|
entries.insert(previousFirstEntry, at: index)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
entries = normalizeEntries(entries)
|
entries = normalizeEntries(entries)
|
||||||
self.galleryNode.pager.replaceItems(entries.map({ entry in PeerAvatarImageGalleryItem(context: self.context, peer: self.peer, presentationData: presentationData, entry: entry, sourceCorners: self.sourceCorners, delete: self.canDelete ? { [weak self] in
|
self.galleryNode.pager.replaceItems(entries.map({ entry in PeerAvatarImageGalleryItem(context: self.context, peer: self.peer, presentationData: presentationData, entry: entry, sourceCorners: self.sourceCorners, delete: self.canDelete ? { [weak self] in
|
||||||
self?.deleteEntry(entry)
|
self?.deleteEntry(entry)
|
||||||
@ -638,6 +636,10 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr
|
|||||||
self?.editEntry(entry)
|
self?.editEntry(entry)
|
||||||
}) }), centralItemIndex: 0, synchronous: true)
|
}) }), centralItemIndex: 0, synchronous: true)
|
||||||
self.entries = entries
|
self.entries = entries
|
||||||
|
|
||||||
|
if let firstEntry = self.entries.first {
|
||||||
|
self._hiddenMedia.set(.single(firstEntry))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// if let messageId = messageId {
|
// if let messageId = messageId {
|
||||||
|
@ -43,6 +43,7 @@ private final class ProfileDataPhotoPreloadContext {
|
|||||||
|
|
||||||
let disposable: Disposable
|
let disposable: Disposable
|
||||||
var value: Any?
|
var value: Any?
|
||||||
|
var skipNext = false
|
||||||
var emptyTimer: SwiftSignalKit.Timer?
|
var emptyTimer: SwiftSignalKit.Timer?
|
||||||
|
|
||||||
init(disposable: Disposable) {
|
init(disposable: Disposable) {
|
||||||
@ -210,6 +211,9 @@ private final class PeerChannelMemberCategoriesContextsManagerImpl {
|
|||||||
let context: ProfileDataPhotoPreloadContext
|
let context: ProfileDataPhotoPreloadContext
|
||||||
if let current = self.profileDataPhotoPreloadContexts[peerId] {
|
if let current = self.profileDataPhotoPreloadContexts[peerId] {
|
||||||
context = current
|
context = current
|
||||||
|
if let _ = context.value {
|
||||||
|
context.skipNext = true
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
let disposable = MetaDisposable()
|
let disposable = MetaDisposable()
|
||||||
context = ProfileDataPhotoPreloadContext(disposable: disposable)
|
context = ProfileDataPhotoPreloadContext(disposable: disposable)
|
||||||
@ -219,6 +223,10 @@ private final class PeerChannelMemberCategoriesContextsManagerImpl {
|
|||||||
guard let context = context else {
|
guard let context = context else {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if context.skipNext {
|
||||||
|
context.skipNext = false
|
||||||
|
return
|
||||||
|
}
|
||||||
context.value = value
|
context.value = value
|
||||||
for f in context.subscribers.copyItems() {
|
for f in context.subscribers.copyItems() {
|
||||||
f(value)
|
f(value)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user