ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c59bbe4a89775305b1575c1ec63203c62f8db575'

Browse Source 
# Conflicts:
#	TelegramUI/FetchMediaUtils.swift
This commit is contained in:
Peter
2018-10-19 20:33:48 +03:00
parent dfa4e6692a c59bbe4a89
commit 66beeb210f
31 changed files with 2147 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TelegramUI/ChatMessageInteractiveMediaNode.swift
View File

@@ -318,8 +318,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
if let strongSelf = self {
if file.isAnimated {
strongSelf.fetchDisposable.set(fetchedMediaResource(postbox: account.postbox, reference: AnyMediaReference.message(message: MessageReference(message), media: file).resourceReference(file.resource), statsCategory: statsCategoryForFileWithAttributes(file.attributes)).start())
} else {
strongSelf.fetchDisposable.set(messageMediaFileInteractiveFetched(account: account, message: message, file: file, userInitiated: manual).start())
} else {
strongSelf.fetchDisposable.set(messageMediaFileInteractiveFetched(account: account, message: message, file: file, userInitiated: manual).start())
}
}
}, cancel: {