marinofaggiana 4 жил өмнө
parent
commit
cfb84aa0b5

+ 1 - 1
File Provider Extension/FileProviderExtension.swift

@@ -226,7 +226,7 @@ class FileProviderExtension: NSFileProviderExtension, NCNetworkingDelegate {
                 fileProviderData.shared.fileProviderManager.register(task!, forItemWithIdentifier: NSFileProviderItemIdentifier(identifier.rawValue)) { (error) in }
                 fileProviderData.shared.fileProviderManager.register(task!, forItemWithIdentifier: NSFileProviderItemIdentifier(identifier.rawValue)) { (error) in }
             }
             }
             
             
-        }) { (account, etag, date, length, error, errorCode, errorDescription) in
+        }) { (account, etag, date, length, allHeaderFields, error, errorCode, errorDescription) in
             
             
             self.outstandingSessionTasks.removeValue(forKey: url)
             self.outstandingSessionTasks.removeValue(forKey: url)
             guard var metadata = fileProviderUtility.shared.getTableMetadataFromItemIdentifier(identifier) else {
             guard var metadata = fileProviderUtility.shared.getTableMetadataFromItemIdentifier(identifier) else {

+ 2 - 2
Nextcloud.xcodeproj/project.pbxproj

@@ -2806,8 +2806,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/nextcloud/ios-communication-library/";
 			repositoryURL = "https://github.com/nextcloud/ios-communication-library/";
 			requirement = {
 			requirement = {
-				branch = develop;
-				kind = branch;
+				kind = revision;
+				revision = b8f648a456ace227573f2d77677fdf034f96b562;
 			};
 			};
 		};
 		};
 		F7C4D88B2534887E00C142DA /* XCRemoteSwiftPackageReference "Parchment" */ = {
 		F7C4D88B2534887E00C142DA /* XCRemoteSwiftPackageReference "Parchment" */ = {

+ 1 - 1
Share/ShareViewController.m

@@ -274,7 +274,7 @@
         
         
         [[NCCommunication shared] uploadWithServerUrlFileName:fileNameServer fileNameLocalPath:fileNameLocal dateCreationFile:nil dateModificationFile:nil customUserAgent:nil addCustomHeaders:nil progressHandler:^(NSProgress * progress) {
         [[NCCommunication shared] uploadWithServerUrlFileName:fileNameServer fileNameLocalPath:fileNameLocal dateCreationFile:nil dateModificationFile:nil customUserAgent:nil addCustomHeaders:nil progressHandler:^(NSProgress * progress) {
             [self.hud progress:progress.fractionCompleted];
             [self.hud progress:progress.fractionCompleted];
-        } completionHandler:^(NSString *account, NSString *ocId, NSString *etag, NSDate *date, int64_t size, NSInteger errorCode, NSString *errorDescription) {
+        } completionHandler:^(NSString *account, NSString *ocId, NSString *etag, NSDate *date, int64_t size, NSDictionary *allHeaderFields, NSInteger errorCode, NSString *errorDescription) {
             [self.hud hideHud];
             [self.hud hideHud];
             [self.filesName removeObject:fileName];
             [self.filesName removeObject:fileName];
            
            

+ 1 - 1
iOSClient/Activity/NCActivity.swift

@@ -384,7 +384,7 @@ extension activityTableViewCell: UICollectionViewDelegate {
                 
                 
             }, progressHandler: { (_) in
             }, progressHandler: { (_) in
                 
                 
-            }) { (account, etag, date, lenght, error, errorCode, errorDescription) in
+            }) { (account, etag, date, lenght, allHeaderFields, error, errorCode, errorDescription) in
                 
                 
                 if account == self.appDelegate.account && errorCode == 0 {
                 if account == self.appDelegate.account && errorCode == 0 {
                     
                     

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

@@ -492,7 +492,7 @@ import NCCommunication
             
             
         }, progressHandler: { (_) in
         }, progressHandler: { (_) in
             
             
-        }) { (account, etag, date, lenght, error, errorCode, errorDescription) in
+        }) { (account, etag, date, lenght, allHeaderFields, error, errorCode, errorDescription) in
             
             
             if errorCode == 0 && account == self.appDelegate.account {
             if errorCode == 0 && account == self.appDelegate.account {
                 self.collectionView.reloadItems(at: [indexPath])
                 self.collectionView.reloadItems(at: [indexPath])

+ 2 - 2
iOSClient/Main/NCDetailViewController.swift

@@ -652,7 +652,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
                                 
                                 
                 self.progress(Float(progress.fractionCompleted))
                 self.progress(Float(progress.fractionCompleted))
                 
                 
-            }) { (account, etag, date, length, error, errorCode, errorDescription) in
+            }) { (account, etag, date, length, allHeaderFields, error, errorCode, errorDescription) in
                 
                 
                 if errorCode == 0 && account == metadata.account {
                 if errorCode == 0 && account == metadata.account {
                     
                     
@@ -770,7 +770,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
                                     
                                     
                     self.progress(Float(progress.fractionCompleted))
                     self.progress(Float(progress.fractionCompleted))
                     
                     
-                }) { (account, etag, date, length, error, errorCode, errorDescription) in
+                }) { (account, etag, date, length, allHeaderFields, error, errorCode, errorDescription) in
                     
                     
                     self.progress(0)
                     self.progress(0)
                     
                     

+ 2 - 2
iOSClient/Networking/NCNetworking.swift

@@ -259,7 +259,7 @@ import Queuer
             
             
             NotificationCenter.default.postOnMainThread(name: k_notificationCenter_progressTask, object: nil, userInfo: ["account":metadata.account, "ocId":metadata.ocId, "serverUrl":metadata.serverUrl, "status":NSNumber(value: k_metadataStatusInDownload), "progress":NSNumber(value: progress.fractionCompleted), "totalBytes":NSNumber(value: progress.totalUnitCount), "totalBytesExpected":NSNumber(value: progress.completedUnitCount)])
             NotificationCenter.default.postOnMainThread(name: k_notificationCenter_progressTask, object: nil, userInfo: ["account":metadata.account, "ocId":metadata.ocId, "serverUrl":metadata.serverUrl, "status":NSNumber(value: k_metadataStatusInDownload), "progress":NSNumber(value: progress.fractionCompleted), "totalBytes":NSNumber(value: progress.totalUnitCount), "totalBytesExpected":NSNumber(value: progress.completedUnitCount)])
             
             
-        }) { (account, etag, date, length, error, errorCode, errorDescription) in
+        }) { (account, etag, date, length, allHeaderFields, error, errorCode, errorDescription) in
                        
                        
             if error?.isExplicitlyCancelledError ?? false {
             if error?.isExplicitlyCancelledError ?? false {
                             
                             
@@ -395,7 +395,7 @@ import Queuer
             
             
             NotificationCenter.default.postOnMainThread(name: k_notificationCenter_progressTask, userInfo: ["account":metadata.account, "ocId":metadata.ocId, "serverUrl":metadata.serverUrl, "status":NSNumber(value: k_metadataStatusInUpload), "progress":NSNumber(value: progress.fractionCompleted), "totalBytes":NSNumber(value: progress.totalUnitCount), "totalBytesExpected":NSNumber(value: progress.completedUnitCount)])
             NotificationCenter.default.postOnMainThread(name: k_notificationCenter_progressTask, userInfo: ["account":metadata.account, "ocId":metadata.ocId, "serverUrl":metadata.serverUrl, "status":NSNumber(value: k_metadataStatusInUpload), "progress":NSNumber(value: progress.fractionCompleted), "totalBytes":NSNumber(value: progress.totalUnitCount), "totalBytesExpected":NSNumber(value: progress.completedUnitCount)])
             
             
-        }) { (account, ocId, etag, date, size, error, errorCode, errorDescription) in
+        }) { (account, ocId, etag, date, size, allHeaderFields, error, errorCode, errorDescription) in
          
          
             self.uploadRequest[fileNameLocalPath] = nil
             self.uploadRequest[fileNameLocalPath] = nil
             self.uploadComplete(fileName: metadata.fileName, serverUrl: metadata.serverUrl, ocId: ocId, etag: etag, date: date, size: size, description: description, task: task!, errorCode: errorCode, errorDescription: errorDescription)
             self.uploadComplete(fileName: metadata.fileName, serverUrl: metadata.serverUrl, ocId: ocId, etag: etag, date: date, size: size, description: description, task: task!, errorCode: errorCode, errorDescription: errorDescription)

+ 1 - 1
iOSClient/Networking/NCNetworkingE2EE.swift

@@ -275,7 +275,7 @@ import Alamofire
                     
                     
                     NotificationCenter.default.postOnMainThread(name: k_notificationCenter_progressTask, userInfo: ["account":metadata.account, "ocId":metadata.ocId, "serverUrl":serverUrl, "status":NSNumber(value: k_metadataStatusInUpload), "progress":NSNumber(value: progress.fractionCompleted), "totalBytes":NSNumber(value: progress.totalUnitCount), "totalBytesExpected":NSNumber(value: progress.completedUnitCount)])
                     NotificationCenter.default.postOnMainThread(name: k_notificationCenter_progressTask, userInfo: ["account":metadata.account, "ocId":metadata.ocId, "serverUrl":serverUrl, "status":NSNumber(value: k_metadataStatusInUpload), "progress":NSNumber(value: progress.fractionCompleted), "totalBytes":NSNumber(value: progress.totalUnitCount), "totalBytesExpected":NSNumber(value: progress.completedUnitCount)])
                     
                     
-                }) { (account, ocId, etag, date, size, error, errorCode, errorDescription) in
+                }) { (account, ocId, etag, date, size, allHeaderFields, error, errorCode, errorDescription) in
                 
                 
                     NCNetworking.shared.uploadRequest[fileNameLocalPath] = nil
                     NCNetworking.shared.uploadRequest[fileNameLocalPath] = nil
                     guard let metadata = NCManageDatabase.sharedInstance.getMetadataFromOcId(metadata.ocId) else { return }
                     guard let metadata = NCManageDatabase.sharedInstance.getMetadataFromOcId(metadata.ocId) else { return }