diff --git a/ios/Audio/AudioMain.swift b/ios/Audio/AudioMain.swift index 24731981..b3ac4973 100644 --- a/ios/Audio/AudioMain.swift +++ b/ios/Audio/AudioMain.swift @@ -7,10 +7,6 @@ import AVFoundation - - - -let AlAsset_Library_Scheme = "assets-library" class AudioMain{ static func compress_audio(_ fileUrl: String, optionMap: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { do { diff --git a/ios/Image/ImageCompressor.swift b/ios/Image/ImageCompressor.swift index 6b7cc49f..81cfc32e 100644 --- a/ios/Image/ImageCompressor.swift +++ b/ios/Image/ImageCompressor.swift @@ -366,18 +366,10 @@ class ImageCompressor { var size = CGSize.zero var scale: CGFloat = 1 var resizeMode = RCTResizeMode.contain - var assetID = "" - var results: PHFetchResult? + let assetID = imagePath.replacingOccurrences(of: "ph://", with: "") + let results = PHAsset.fetchAssets(withLocalIdentifiers: [assetID], options: nil) - if imageURL?.scheme?.caseInsensitiveCompare("assets-library") == .orderedSame { - assetID = imageURL?.absoluteString ?? "" - results = PHAsset.fetchAssets(withALAssetURLs: [imageURL!], options: nil) - } else { - assetID = imagePath.replacingOccurrences(of: "ph://", with: "") - results = PHAsset.fetchAssets(withLocalIdentifiers: [assetID], options: nil) - } - - guard let asset = results?.firstObject else { + guard let asset = results.firstObject else { return } diff --git a/ios/Utils/Utils.swift b/ios/Utils/Utils.swift index 841652be..b6d599e1 100644 --- a/ios/Utils/Utils.swift +++ b/ios/Utils/Utils.swift @@ -17,10 +17,7 @@ class Utils { } static func makeValidUri(filePath: String) -> String { - let fileWithUrl = URL(fileURLWithPath: filePath) - let absoluteUrl = fileWithUrl.deletingLastPathComponent() - let fileUrl = "file://\(absoluteUrl.path)/\(fileWithUrl.lastPathComponent)" - return fileUrl; + return (filePath.starts(with: "file://") ? URL(string: filePath)! : URL(fileURLWithPath: filePath)).absoluteURL.absoluteString } static func getFileSize(from urlString: String, completion: @escaping (NSNumber?, Error?) -> Void) { diff --git a/ios/Video/VideoMain.swift b/ios/Video/VideoMain.swift index 6fe5e9ce..af8a0b56 100644 --- a/ios/Video/VideoMain.swift +++ b/ios/Video/VideoMain.swift @@ -1,5 +1,4 @@ import Foundation -import AssetsLibrary import AVFoundation import Photos import MobileCoreServices