Skip to content

Fix media silently not saving to Photos (Save to Camera Roll) #2186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
estevecastells wants to merge 1 commit into
base: master
Choose a base branch
from
+68 −27
Open

Fix media silently not saving to Photos (Save to Camera Roll) #2186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 68 additions & 27 deletions submodules/SaveToCameraRoll/Sources/SaveToCameraRoll.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,49 +152,90 @@ public func saveToCameraRoll(context: AccountContext, userLocation: MediaResourc
return
}

let tempVideoPath = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max)).mp4"
if isImage, let videoData, let imageData = try? Data(contentsOf: URL(fileURLWithPath: mainData.path)) {
let id = UUID().uuidString
let id = UUID().uuidString

let jpegWithID = addAssetIdentifierToJPEG(imageData, assetIdentifier: id)!
let outputVideoURL = URL(fileURLWithPath: NSTemporaryDirectory() + "\(id).mov")

try? FileManager.default.copyItem(atPath: videoData.path, toPath: tempVideoPath)

addAssetIdentifierToVideo(inputURL: URL(fileURLWithPath: tempVideoPath), outputURL: outputVideoURL, assetIdentifier: id) { success in
guard success else { return }

PHPhotoLibrary.shared().performChanges({
let request = PHAssetCreationRequest.forAsset()
// Builds a temporary path that preserves the source file's extension. Copying a
// video to a hardcoded ".mp4" path makes `creationRequestForAssetFromVideo` reject
// any container that isn't actually mp4 (e.g. .mov), so the asset silently never
// appears in Photos. Falling back to "mov" matches the most common Telegram video.
func temporaryPath(preservingExtensionOf sourcePath: String) -> String {
let pathExtension = (sourcePath as NSString).pathExtension
return NSTemporaryDirectory() + "\(UUID().uuidString)." + (pathExtension.isEmpty ? "mov" : pathExtension)
}

request.addResource(with: .photo, data: jpegWithID, options: nil)
request.addResource(with: .pairedVideo, fileURL: outputVideoURL, options: nil)
}, completionHandler: { _, error in
let _ = try? FileManager.default.removeItem(atPath: tempVideoPath)
subscriber.putNext(1.0)
subscriber.putCompletion()
})
}
} else {
// Saves the plain photo or video. This is both the normal path for non-motion media
// and the fallback when a motion-photo write fails, so it always finishes the signal
// and the saved media still lands in Photos.
func savePlainMedia() {
let videoTempPath = temporaryPath(preservingExtensionOf: mainData.path)
var didStageResource = false
PHPhotoLibrary.shared().performChanges({
if isImage {
if let imageData = try? Data(contentsOf: URL(fileURLWithPath: mainData.path)) {
PHAssetCreationRequest.forAsset().addResource(with: .photo, data: imageData, options: nil)
didStageResource = true
}
} else {
if let _ = try? FileManager.default.copyItem(atPath: mainData.path, toPath: tempVideoPath) {
PHAssetChangeRequest.creationRequestForAssetFromVideo(atFileURL: URL(fileURLWithPath: tempVideoPath))
if let _ = try? FileManager.default.copyItem(atPath: mainData.path, toPath: videoTempPath) {
PHAssetChangeRequest.creationRequestForAssetFromVideo(atFileURL: URL(fileURLWithPath: videoTempPath))
didStageResource = true
}
}
}, completionHandler: { _, error in
}, completionHandler: { success, error in
// PhotoKit reports success even when the change block stages nothing, so a
// failed read/copy would otherwise look like a successful save. Log when the
// media did not actually land so the failure is diagnosable.
if let error {
print("\(error)")
print("SaveToCameraRoll: failed to save media: \(error)")
} else if !didStageResource || !success {
print("SaveToCameraRoll: media was not saved (didStageResource: \(didStageResource), success: \(success))")
}
let _ = try? FileManager.default.removeItem(atPath: tempVideoPath)
let _ = try? FileManager.default.removeItem(atPath: videoTempPath)
subscriber.putNext(1.0)
subscriber.putCompletion()
})
}

if isImage, let videoData,
let imageData = try? Data(contentsOf: URL(fileURLWithPath: mainData.path)),
let jpegWithID = addAssetIdentifierToJPEG(imageData, assetIdentifier: id) {
let pairedVideoTempPath = temporaryPath(preservingExtensionOf: videoData.path)
let outputVideoURL = URL(fileURLWithPath: NSTemporaryDirectory() + "\(id).mov")

let _ = try? FileManager.default.copyItem(atPath: videoData.path, toPath: pairedVideoTempPath)

addAssetIdentifierToVideo(inputURL: URL(fileURLWithPath: pairedVideoTempPath), outputURL: outputVideoURL, assetIdentifier: id) { success in
let _ = try? FileManager.default.removeItem(atPath: pairedVideoTempPath)
guard success else {
// The export that embeds the motion-photo identifier failed. Previously
// the signal was left hanging forever and nothing was saved; instead fall
// back to saving the still image so it still lands in Photos.
savePlainMedia()
return
}

PHPhotoLibrary.shared().performChanges({
let request = PHAssetCreationRequest.forAsset()

request.addResource(with: .photo, data: jpegWithID, options: nil)
request.addResource(with: .pairedVideo, fileURL: outputVideoURL, options: nil)
}, completionHandler: { success, error in
let _ = try? FileManager.default.removeItem(at: outputVideoURL)
if success {
subscriber.putNext(1.0)
subscriber.putCompletion()
} else {
if let error {
print("SaveToCameraRoll: failed to save motion photo: \(error)")
}
// Saving the paired photo+video failed; fall back to the still image.
savePlainMedia()
}
})
}
} else {
savePlainMedia()
}
})

return ActionDisposable {
Expand Down