coding

Cartfile.resolved

@@ -19,7 +19,7 @@ github "marinofaggiana/AFNetworking" "2967678c3e0e98c9b8d7e06222ad12d1f49c26f2"
 github "marinofaggiana/KTVHTTPCache" "2.0.2"
 github "marinofaggiana/TOPasscodeViewController" "0.0.6"
 github "marinofaggiana/XLForm" "eb9381ad8129f60402bf412250fb31b95a628a08"
-github "nextcloud/ios-communication-library" "2388c0a14f8005072d7b3b6f3fc9c6dcb43076ed"
+github "nextcloud/ios-communication-library" "d1c7169407d398f55bdfcecc805a7327eccb7b7b"
 github "realm/realm-cocoa" "v4.4.1"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.4"

File Provider Extension/FileProviderEnumerator.swift

@@ -200,7 +200,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             
             for metadata in metadatas! {
                     
-                if metadata.e2eEncrypted || (metadata.session != "" && metadata.session != k_upload_session_extension) { continue }
+                if metadata.e2eEncrypted || (metadata.session != "" && metadata.session != NCCommunicationCommon.shared.sessionIdentifierExtension) { continue }
                     
                 fileProviderUtility.sharedInstance.createocIdentifierOnFileSystem(metadata: metadata)
                         

File Provider Extension/FileProviderExtension.swift

@@ -348,7 +348,7 @@ class FileProviderExtension: NSFileProviderExtension {
                 fileURL.stopAccessingSecurityScopedResource()
                                 
                 let metadata = NCManageDatabase.sharedInstance.createMetadata(account: fileProviderData.sharedInstance.account, fileName: fileName, ocId: ocIdTemp, serverUrl: tableDirectory.serverUrl, url: "", contentType: "")
-                metadata.session = k_upload_session_extension
+                metadata.session = NCCommunicationCommon.shared.sessionIdentifierExtension
                 metadata.size = size
                 metadata.status = Int(k_metadataStatusInUpload)
                 

iOSClient/AppDelegate.m

@@ -1343,7 +1343,8 @@
     
     // Upload in pending
     //
-    NSArray *metadatasInUpload = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"session != %@ AND status == %d AND sessionTaskIdentifier == 0", k_upload_session_extension, k_metadataStatusInUpload] sorted:nil ascending:true];
+    NSString *sessionExtension = [[NCCommunicationCommon shared] sessionIdentifierExtension];
+    NSArray *metadatasInUpload = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"session != %@ AND status == %d AND sessionTaskIdentifier == 0", sessionExtension, k_metadataStatusInUpload] sorted:nil ascending:true];
     for (tableMetadata *metadata in metadatasInUpload) {
         if ([self.sessionPendingStatusInUpload containsObject:metadata.ocId]) {
             metadata.status = k_metadataStatusWaitUpload;
@@ -1371,7 +1372,8 @@
 {
     // UPLOAD
     //
-    NSArray *metadatasUploading = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"session != %@ AND status == %d", k_upload_session_extension, k_metadataStatusUploading] sorted:nil ascending:true];
+    NSString *sessionExtension = [[NCCommunicationCommon shared] sessionIdentifierExtension];
+    NSArray *metadatasUploading = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"session != %@ AND status == %d", sessionExtension, k_metadataStatusUploading] sorted:nil ascending:true];
     for (tableMetadata *metadata in metadatasUploading) {
         
         NSURLSession *session = [[CCNetworking sharedNetworking] getSessionfromSessionDescription:metadata.session];

iOSClient/CCGlobal.h

@@ -125,9 +125,6 @@
 #define k_download_session_default                      @"download.default"
 #define k_upload_session_default                        @"upload.default"
 
-// Session Download Upload Extension
-#define k_upload_session_extension                      @"com.nextcloud.upload.session.extension"
-
 // OperationQueue
 #define k_queue                                         @"it.twsweb.Crypto-Cloud.queue"
 #define k_download_queue                                @"it.twsweb.Crypto-Cloud.download.queue"

iOSClient/Main/NCMainCommon.swift

@@ -653,6 +653,9 @@ class NCMainCommon: NSObject, NCAudioRecorderViewControllerDelegate, UIDocumentI
             
             cell.transferButton.tintColor = NCBrandColor.sharedInstance.optionItem
             
+            cell.labelTitle.isEnabled = true
+            cell.labelInfoFile.isEnabled = true
+            
             var progress: CGFloat = 0.0
             var totalBytes: Double = 0.0
             //var totalBytesExpected : Double = 0
@@ -704,17 +707,7 @@ class NCMainCommon: NSObject, NCAudioRecorderViewControllerDelegate, UIDocumentI
                 }
             }
             
-            // Session Upload Extension
-            if metadata.session == k_upload_session_extension {
-                
-                cell.labelTitle.isEnabled = false
-                cell.labelInfoFile.isEnabled = false
-                
-            } else {
-                
-                cell.labelTitle.isEnabled = true
-                cell.labelInfoFile.isEnabled = true
-            }
+           
             
             // downloadFile
             if metadata.status == k_metadataStatusWaitDownload || metadata.status == k_metadataStatusInDownload || metadata.status == k_metadataStatusDownloading || metadata.status == k_metadataStatusDownloadError {

iOSClient/Networking/CCNetworking.m

@@ -185,27 +185,6 @@
     return sessionUploadForeground;
 }
 
-- (NSURLSession *)sessionUploadExtension
-{
-    static NSURLSession *sessionUpload = nil;
-    
-    if (sessionUpload == nil) {
-        
-        NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:k_upload_session_extension];
-        
-        configuration.allowsCellularAccess = YES;
-        configuration.sessionSendsLaunchEvents = YES;
-        configuration.discretionary = NO;
-        configuration.HTTPMaximumConnectionsPerHost = 1;
-        configuration.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
-        configuration.sharedContainerIdentifier = [NCBrandOptions sharedInstance].capabilitiesGroups;
-        
-        sessionUpload = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
-        sessionUpload.sessionDescription = k_upload_session_extension;
-    }
-    return sessionUpload;
-}
-
 - (NSURLSession *)getSessionfromSessionDescription:(NSString *)sessionDescription
 {
     if ([sessionDescription isEqualToString:k_download_session]) return [self sessionDownload];
@@ -216,8 +195,6 @@
     if ([sessionDescription isEqualToString:k_upload_session_wwan]) return [self sessionWWanUpload];
     if ([sessionDescription isEqualToString:k_upload_session_foreground]) return [self sessionUploadForeground];
     
-    if ([sessionDescription isEqualToString:k_upload_session_extension]) return [self sessionUploadExtension];
-
     return nil;
 }
 
@@ -797,7 +774,6 @@
                 if ([metadata.session isEqualToString:k_upload_session]) sessionUpload = [self sessionUpload];
                 else if ([metadata.session isEqualToString:k_upload_session_wwan]) sessionUpload = [self sessionWWanUpload];
                 else if ([metadata.session isEqualToString:k_upload_session_foreground]) sessionUpload = [self sessionUploadForeground];
-                else if ([metadata.session isEqualToString:k_upload_session_extension]) sessionUpload = [self sessionUploadExtension];
                 
                 [request setValue:e2eToken forHTTPHeaderField:@"e2e-token"];
                 NSURLSessionUploadTask *uploadTask = [sessionUpload uploadTaskWithRequest:request fromFile:[NSURL fileURLWithPath:[CCUtility getDirectoryProviderStorageOcId:metadata.ocId fileNameView:metadata.fileName]]];
@@ -828,7 +804,6 @@
          if ([metadata.session isEqualToString:k_upload_session]) sessionUpload = [self sessionUpload];
          else if ([metadata.session isEqualToString:k_upload_session_wwan]) sessionUpload = [self sessionWWanUpload];
          else if ([metadata.session isEqualToString:k_upload_session_foreground]) sessionUpload = [self sessionUploadForeground];
-         else if ([metadata.session isEqualToString:k_upload_session_extension]) sessionUpload = [self sessionUploadExtension];
          
          NSURLSessionUploadTask *uploadTask = [sessionUpload uploadTaskWithRequest:request fromFile:[NSURL fileURLWithPath:[CCUtility getDirectoryProviderStorageOcId:metadata.ocId fileNameView:metadata.fileName]]];
          

iOSClient/Transfers/CCTransfers.m

@@ -188,9 +188,11 @@
         }
     }
     
+    /*
     if (!([metadataForRecognizer.session isEqualToString:k_upload_session_extension]) &&(metadataForRecognizer.status == k_metadataStatusWaitUpload || metadataForRecognizer.status == k_metadataStatusUploading)) {
         return YES;
     }
+    */
     
     return NO;
 }