marinofaggiana 4 년 전
부모
커밋
634952a1c4
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      iOSClient/Main/Create cloud/NCCreateFormUploadAssets.swift
  2. 1 1
      iOSClient/Networking/NCAutoUpload.swift

+ 1 - 1
iOSClient/Main/Create cloud/NCCreateFormUploadAssets.swift

@@ -380,7 +380,7 @@ class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
                 let dateFormatter = DateFormatter()
                 
                 // Detect LivePhoto Upload
-                if (asset.mediaSubtypes == PHAssetMediaSubtype.photoLive || asset.mediaSubtypes.rawValue == PHAssetMediaSubtype.photoLive.rawValue + PHAssetMediaSubtype.photoHDR.rawValue) && CCUtility.getLivePhoto() {
+                if asset.mediaSubtypes.contains(.photoLive) && CCUtility.getLivePhoto() {
                     livePhoto = true
                 } 
                 

+ 1 - 1
iOSClient/Networking/NCAutoUpload.swift

@@ -180,7 +180,7 @@ class NCAutoUpload: NSObject, CLLocationManagerDelegate {
                     
                     let fileName = CCUtility.createFileName(asset.value(forKey: "filename") as? String, fileDate: assetDate, fileType: assetMediaType, keyFileName: NCBrandGlobal.shared.keyFileNameAutoUploadMask, keyFileNameType: NCBrandGlobal.shared.keyFileNameAutoUploadType, keyFileNameOriginal: NCBrandGlobal.shared.keyFileNameOriginalAutoUpload)!
                     
-                    if (asset.mediaSubtypes.rawValue == PHAssetMediaSubtype.photoLive.rawValue || asset.mediaSubtypes.rawValue == (PHAssetMediaSubtype.photoHDR.rawValue + PHAssetMediaSubtype.photoLive.rawValue)) && CCUtility.getLivePhoto() {
+                    if asset.mediaSubtypes.contains(.photoLive) && CCUtility.getLivePhoto() {
                         livePhoto = true
                     }