From 460b3c311633c4ddc0c5ffbc7ccb364ca9be6d46 Mon Sep 17 00:00:00 2001 From: overtake <> Date: Tue, 16 Jun 2020 17:29:06 +0300 Subject: [PATCH 1/2] no message --- submodules/TelegramCore/Sources/PeerPhotoUpdater.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramCore/Sources/PeerPhotoUpdater.swift b/submodules/TelegramCore/Sources/PeerPhotoUpdater.swift index 67e7c1aabf..acfa06d2d7 100644 --- a/submodules/TelegramCore/Sources/PeerPhotoUpdater.swift +++ b/submodules/TelegramCore/Sources/PeerPhotoUpdater.swift @@ -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) From 1d8b3afd6b8d2f8b0cfa1ec908c5d9d75942eed9 Mon Sep 17 00:00:00 2001 From: overtake <> Date: Tue, 16 Jun 2020 21:16:41 +0300 Subject: [PATCH 2/2] fixes [skip ci] --- submodules/TelegramCore/Sources/ApplyUpdateMessage.swift | 2 +- .../TelegramCore/Sources/PendingMessageUploadedContent.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/TelegramCore/Sources/ApplyUpdateMessage.swift b/submodules/TelegramCore/Sources/ApplyUpdateMessage.swift index c6cf4442b8..ebabf4ab90 100644 --- a/submodules/TelegramCore/Sources/ApplyUpdateMessage.swift +++ b/submodules/TelegramCore/Sources/ApplyUpdateMessage.swift @@ -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) diff --git a/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift b/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift index 16b490b314..6d248bfa43 100644 --- a/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift +++ b/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift @@ -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