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

Merge commit '4f56a43dda968e9fc9fd31e09fa2b81332aa12a3'

Browse Source
This commit is contained in:
Ali 2020-06-16 23:07:17 +04:00
commit d4bd039b6e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/TelegramCore/Sources/ApplyUpdateMessage.swift
View File

@ -6,7 +6,7 @@ import SwiftSignalKit
import SyncCore
private func copyOrMoveResourceData(from fromResource: MediaResource, to toResource: MediaResource, mediaBox: MediaBox) {
if fromResource is CloudFileMediaResource || fromResource is CloudDocumentMediaResource {
if fromResource is CloudFileMediaResource || fromResource is CloudDocumentMediaResource || fromResource is SecretFileMediaResource {
mediaBox.copyResourceData(from: fromResource.id, to: toResource.id)
} else {
mediaBox.moveResourceData(from: fromResource.id, to: toResource.id)

2
submodules/TelegramCore/Sources/PeerPhotoUpdater.swift
View File

@ -71,7 +71,7 @@ public func updatePeerPhotoInternal(postbox: Postbox, network: Network, stateMan
if let video = video {
mappedVideo = video
|> take(until: { value in
if case let .result(resultData) = value?.content, case .inputFile = resultData {
if case let .result(resultData)? = value?.content, case .inputFile = resultData {
return SignalTakeAction(passthrough: true, complete: true)
} else {
return SignalTakeAction(passthrough: true, complete: false)

2
submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift
View File

@ -662,7 +662,7 @@ private func uploadedMediaFileContent(network: Network, postbox: Postbox, auxili
return .single(.pending)
case let .done(media):
if let media = media as? TelegramMediaFile, let smallestThumbnail = smallestImageRepresentation(media.previewRepresentations) {
if peerId.namespace == Namespaces.Peer.SecretChat {
if peerId.namespace == Namespaces.Peer.SecretChat || (smallestThumbnail.resource is LocalFileMediaResource) {
return .single(.done(media, .none))
} else {
let fileReference: AnyMediaReference