Merge branch 'master' into feature/secureid

# Conflicts:
#	TelegramCore/DeleteMessages.swift
This commit is contained in:
Peter 2018-07-20 13:54:09 +03:00
commit 7e5b5b4616

View File

@ -16,7 +16,7 @@ public func deleteMessages(transaction: Transaction, mediaBox: MediaBox, ids: [M
let _ = mediaBox.removeCachedResources(Set(image.representations.map({ WrappedMediaResourceId($0.resource.id) }))).start() let _ = mediaBox.removeCachedResources(Set(image.representations.map({ WrappedMediaResourceId($0.resource.id) }))).start()
} else if let file = media as? TelegramMediaFile { } else if let file = media as? TelegramMediaFile {
let _ = mediaBox.removeCachedResources(Set(file.previewRepresentations.map({ WrappedMediaResourceId($0.resource.id) }))).start() let _ = mediaBox.removeCachedResources(Set(file.previewRepresentations.map({ WrappedMediaResourceId($0.resource.id) }))).start()
let _ = mediaBox.removeCachedResources(Set([WrappedMediaResourceId(file.resource.id)])) let _ = mediaBox.removeCachedResources(Set([WrappedMediaResourceId(file.resource.id)])).start()
} }
} }
} }