From 7635a8243fe6be04c7901e2e72e53470e36785cb Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Mon, 24 Jul 2023 00:38:25 +0800 Subject: [PATCH] simplify deleting medium method in iOS code --- ios/Classes/SwiftPhotoGalleryPlugin.swift | 37 +++++++++-------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/ios/Classes/SwiftPhotoGalleryPlugin.swift b/ios/Classes/SwiftPhotoGalleryPlugin.swift index 54733b4..ff61397 100644 --- a/ios/Classes/SwiftPhotoGalleryPlugin.swift +++ b/ios/Classes/SwiftPhotoGalleryPlugin.swift @@ -237,30 +237,23 @@ public class SwiftPhotoGalleryPlugin: NSObject, FlutterPlugin { } } - private func deleteMedium(mediumId: String, completion: @escaping (Bool, Error?) -> Void) { - let fetchOptions = PHFetchOptions() - if #available(iOS 9, *) { - fetchOptions.fetchLimit = 1 - } - let assets: PHFetchResult = PHAsset.fetchAssets(withLocalIdentifiers: [mediumId], options: fetchOptions) - - if assets.count <= 0 { - completion(false, NSError(domain: "photo_gallery", code: 404, userInfo: nil)) - } else { - let asset: PHAsset = assets[0] - deleteAssets(assets: [asset]) { success, error in - completion(success, error) - } - } - } + private func deleteMedium(mediumId: String, completion: @escaping (Bool, Error?) -> Void) { + let fetchOptions = PHFetchOptions() + if #available(iOS 9, *) { + fetchOptions.fetchLimit = 1 + } + let assets: PHFetchResult = PHAsset.fetchAssets(withLocalIdentifiers: [mediumId], options: fetchOptions) - private func deleteAssets(assets: [PHAsset], completion: @escaping (Bool, Error?) -> Void) { - PHPhotoLibrary.shared().performChanges({ - PHAssetChangeRequest.deleteAssets(assets as NSFastEnumeration) - }, completionHandler: completion) - } + if assets.count <= 0 { + completion(false, NSError(domain: "photo_gallery", code: 404, userInfo: nil)) + } else { + let asset: PHAsset = assets[0] + PHPhotoLibrary.shared().performChanges({ + PHAssetChangeRequest.deleteAssets([asset] as NSFastEnumeration) + }, completionHandler: completion) + } + } - private func getThumbnail( mediumId: String, width: NSNumber?,