marinofaggiana 4 years ago
parent
commit
be6ae798f8

+ 1 - 1
Cartfile.resolved

@@ -20,7 +20,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" "5a0bb19e32f53ff967f546fdd8845e5eec05ce69"
+github "nextcloud/ios-communication-library" "1cec66e794b24e3a9b5fc9d61d593c4d9bee4b82"
 github "realm/realm-cocoa" "v4.4.1"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.4"

+ 8 - 0
iOSClient/Networking/NCOperationQueue.swift

@@ -32,13 +32,21 @@ import Queuer
     }()
     
     let transferQueue = Queuer(name: "transferQueue", maxConcurrentOperationCount: 5, qualityOfService: .default)
+    let semaphore = Semaphore()
 
     @objc func download(metadata: tableMetadata, selector: String, setFavorite: Bool = false) {
         let concurrentOperation = ConcurrentOperation { operation in
             
             NCNetworking.shared.download(metadata: metadata, selector: selector, setFavorite: setFavorite) { (errorCode) in
+                
+                self.semaphore.continue()
             }
         }
         concurrentOperation.addToQueue(transferQueue)
+        
+        debugPrint("[LOG] Download ADD QUEUE")
+
+        semaphore.wait()
     }
 }
+

+ 2 - 2
iOSClient/Synchronize/CCSynchronize.m

@@ -301,8 +301,8 @@
             [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:metadata.serverUrl account:metadata.account];
         }
 
-        //[[NCOperationQueue shared] downloadWithMetadata:metadata selector:selectorDownloadSynchronize setFavorite:false];
-        [[NCNetworking shared] downloadWithMetadata:metadata selector:selectorDownloadSynchronize setFavorite:false completion:^(NSInteger errorCode) { }];
+        [[NCOperationQueue shared] downloadWithMetadata:metadata selector:selectorDownloadSynchronize setFavorite:false];
+        //[[NCNetworking shared] downloadWithMetadata:metadata selector:selectorDownloadSynchronize setFavorite:false completion:^(NSInteger errorCode) { }];
     }
         
     for (NSString *serverUrl in serverUrlToReload) {