dev

PickerFileProvider/FileProviderExtension+Actions.swift

@@ -117,7 +117,6 @@ extension FileProviderExtension {
         }
         
         // Delete queue upload for ImportDocument (if exists)
-        NCManageDatabase.sharedInstance.deleteQueueUpload(assetLocalIdentifier: metadata.assetLocalIdentifier, selector: metadata.sessionSelector)
         
         //
         deleteFile(withIdentifier: itemIdentifier, parentItemIdentifier: parentItemIdentifier, metadata: metadata, serverUrl: serverUrl)

PickerFileProvider/FileProviderExtension+Network.swift

@@ -223,8 +223,6 @@ extension FileProviderExtension {
             // importDocument
             if (selectorPost == providerData.selectorPostImportDocument) {
                 
-                NCManageDatabase.sharedInstance.deleteQueueUpload(assetLocalIdentifier: assetLocalIdentifier, selector: selector)
-                
                 // Rename directory file
                 if providerData.fileManager.fileExists(atPath: providerData.fileProviderStorageURL!.path + "/" + assetLocalIdentifier) {
                     let itemIdentifier = providerData.getItemIdentifier(metadata: metadata)
@@ -269,7 +267,7 @@ extension FileProviderExtension {
             // importDocument
             if (selectorPost == providerData.selectorPostImportDocument) {
                 
-                NCManageDatabase.sharedInstance.unlockQueueUpload(assetLocalIdentifier: assetLocalIdentifier)
+//                NCManageDatabase.sharedInstance.unlockQueueUpload(assetLocalIdentifier: assetLocalIdentifier)
                 
                 DispatchQueue.main.asyncAfter(deadline: .now() + providerData.timeReupload) {
                     

iOSClient/AppDelegate.m

@@ -1442,13 +1442,15 @@
     // ------------------------- <selector Auto Upload> -------------------------
     
     if (counterUpload < k_maxConcurrentOperationUpload) {
-        
+
+        /*
         metadataNet = [[NCManageDatabase sharedInstance] lockQueueUploadWithSelector:selectorUploadAutoUpload session:nil];
         if (metadataNet) {
             
-//            [[CCNetworking sharedNetworking] uploadFileFromAssetLocalIdentifier:metadataNet delegate:_activeMain];
+           [[CCNetworking sharedNetworking] uploadFileFromAssetLocalIdentifier:metadataNet delegate:_activeMain];
             
         }
+        */
     }
   
     // ------------------------- <selector Auto Upload All> ----------------------
@@ -1467,11 +1469,13 @@
         
         if (counterUpload < k_maxConcurrentOperationUpload) {
             
+            /*
             metadataNet = [[NCManageDatabase sharedInstance] lockQueueUploadWithSelector:selectorUploadAutoUploadAll session:nil];
             if (metadataNet) {
                 
 //                [[CCNetworking sharedNetworking] uploadFileFromAssetLocalIdentifier:metadataNet delegate:_activeMain];
             }
+            */
         }
     }
   

iOSClient/Database/NCDatabase.swift

@@ -256,25 +256,6 @@ class tableQueueDownload: Object {
     }
 }
 
-class tableQueueUpload: Object {
-    
-    @objc dynamic var account = ""
-    @objc dynamic var assetLocalIdentifier = ""
-    @objc dynamic var date = NSDate()
-    @objc dynamic var errorCode: Int = 0
-    @objc dynamic var fileName = ""
-    @objc dynamic var fileNameView = ""
-    @objc dynamic var lock: Bool = false
-    @objc dynamic var path: String?
-    @objc dynamic var selector = ""
-    @objc dynamic var selectorPost = ""
-    @objc dynamic var serverUrl = ""
-    @objc dynamic var session = ""
-    @objc dynamic var sessionError = ""
-    @objc dynamic var sessionTaskIdentifier: Int = -1
-    @objc dynamic var size: Double = 0
-}
-
 class tableShare: Object {
     
     @objc dynamic var account = ""

iOSClient/Database/NCManageDatabase.swift

@@ -2243,194 +2243,6 @@ class NCManageDatabase: NSObject {
         return results.count
     }
 
-    
-    //MARK: -
-    //MARK: Table Queue Upload
-    
-    
-    
-    @objc func getQueueUpload(predicate: NSPredicate) -> [tableQueueUpload]? {
-        
-        guard self.getAccountActive() != nil else {
-            return nil
-        }
-        
-        let realm = try! Realm()
-        realm.refresh()
-        
-        let results = realm.objects(tableQueueUpload.self).filter(predicate)
-        
-        return Array(results.map { tableQueueUpload.init(value:$0) })
-    }
-    
-    @objc func getQueueUpload() -> CCMetadataNet? {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return nil
-        }
-        
-        let realm = try! Realm()
-        realm.refresh()
-        
-        guard let result = realm.objects(tableQueueUpload.self).filter("account = %@ AND lock == false", tableAccount.account).sorted(byKeyPath: "date", ascending: true).first else {
-            return nil
-        }
-        
-        let metadataNet = CCMetadataNet()
-        
-        metadataNet.account = result.account
-        metadataNet.assetLocalIdentifier = result.assetLocalIdentifier
-        metadataNet.errorCode = result.errorCode
-        metadataNet.directoryID = self.getDirectoryID(result.serverUrl)
-        metadataNet.fileName = result.fileName
-        metadataNet.fileNameView = result.fileNameView
-        metadataNet.path = result.path
-        metadataNet.selector = result.selector
-        metadataNet.selectorPost = result.selectorPost
-        metadataNet.serverUrl = result.serverUrl
-        metadataNet.session = result.session
-        metadataNet.sessionError = result.sessionError
-        metadataNet.sessionTaskIdentifier = result.sessionTaskIdentifier
-        metadataNet.size = result.size
-        metadataNet.taskStatus = Int(k_taskStatusResume)
-        
-        return metadataNet
-    }
-    
-    @objc func getQueueUploadInLock() -> [tableQueueUpload]? {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return nil
-        }
-        
-        let realm = try! Realm()
-        realm.refresh()
-        
-        let results = realm.objects(tableQueueUpload.self).filter("account = %@ AND lock = true", tableAccount.account)
-        
-        return Array(results.map { tableQueueUpload.init(value:$0) })
-    }
-    
-    @objc func lockQueueUpload(selector: String, session: String?) -> CCMetadataNet? {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return nil
-        }
-        
-        var result: tableQueueUpload?
-        
-        let realm = try! Realm()
-        
-        if session == nil {
-            result = realm.objects(tableQueueUpload.self).filter("account = %@ AND selector = %@ AND lock == false", tableAccount.account, selector).sorted(byKeyPath: "date", ascending: true).first
-        } else {
-            result = realm.objects(tableQueueUpload.self).filter("account = %@ AND selector = %@ AND lock == false AND session == %@", tableAccount.account, selector, session!).sorted(byKeyPath: "date", ascending: true).first
-        }
-        
-        if result == nil {
-            return nil
-        }
-        
-        let directoryID = self.getDirectoryID(result!.serverUrl)
-        
-        realm.beginWrite()
-        
-        let metadataNet = CCMetadataNet()
-        
-        metadataNet.account = result!.account
-        metadataNet.assetLocalIdentifier = result!.assetLocalIdentifier
-        metadataNet.directoryID = directoryID
-        metadataNet.errorCode = result!.errorCode
-        metadataNet.fileName = result!.fileName
-        metadataNet.fileNameView = result!.fileNameView
-        metadataNet.path = result!.path
-        metadataNet.selector = result!.selector
-        metadataNet.selectorPost = result!.selectorPost
-        metadataNet.serverUrl = result!.serverUrl
-        metadataNet.session = result!.session
-        metadataNet.sessionError = result!.sessionError
-        metadataNet.sessionTaskIdentifier = result!.sessionTaskIdentifier
-        metadataNet.size = result!.size
-        metadataNet.taskStatus = Int(k_taskStatusResume)
-        
-        // Lock
-        result!.lock = true
-        
-        do {
-            try realm.commitWrite()
-        } catch let error {
-            print("[LOG] Could not write to database: ", error)
-            return nil
-        }
-        
-        return metadataNet
-    }
-    
-    @objc func unlockQueueUpload(assetLocalIdentifier: String) {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return
-        }
-    
-        let realm = try! Realm()
-
-        realm.beginWrite()
-        
-        guard let result = realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", tableAccount.account, assetLocalIdentifier).first else {
-            realm.cancelWrite()
-            return
-        }
-      
-        // UnLock
-        result.lock = false
-        
-        do {
-            try realm.commitWrite()
-        } catch let error {
-            print("[LOG] Could not write to database: ", error)
-        }
-    }
-    
-    @objc func deleteQueueUpload(assetLocalIdentifier: String, selector: String) {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return
-        }
-        
-        let realm = try! Realm()
-
-        do {
-            try realm.write {
-                
-                if let result = realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND selector = %@", tableAccount.account, assetLocalIdentifier, selector).first {
-                    realm.delete(result)
-                }
-            }
-        } catch let error {
-            print("[LOG] Could not write to database: ", error)
-        }
-    }
-    
-    @objc func deleteQueueUpload(path: String) {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return
-        }
-        
-        let realm = try! Realm()
-        
-        do {
-            try realm.write {
-                
-                if let result = realm.objects(tableQueueUpload.self).filter("account = %@ AND path = %@", tableAccount.account, path).first {
-                    realm.delete(result)
-                }
-            }
-        } catch let error {
-            print("[LOG] Could not write to database: ", error)
-        }
-    }
-    
     //MARK: -
     //MARK: Table Share
     

iOSClient/Main/CCMain.m

@@ -1286,10 +1286,7 @@
 }
 
 - (void)uploadFileSuccessFailure:(NSString *)fileName fileID:(NSString *)fileID assetLocalIdentifier:(NSString *)assetLocalIdentifier serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost errorMessage:(NSString *)errorMessage errorCode:(NSInteger)errorCode
-{
-    // Delete record on Table Auto Upload
-    [[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier selector:selector];
-    
+{    
     if (errorCode == 0) {
         
         // Auto Download Upload

iOSClient/Settings/CCAdvanced.m

@@ -355,7 +355,7 @@
     [self.hud visibleHudTitle:NSLocalizedString(@"_remove_cache_", nil) mode:MBProgressHUDModeIndeterminate color:nil];
     
     [[NCManageDatabase sharedInstance] clearTable:[tableQueueDownload class] account:appDelegate.activeAccount];
-    [[NCManageDatabase sharedInstance] clearTable:[tableQueueUpload class] account:appDelegate.activeAccount];
+//    [[NCManageDatabase sharedInstance] clearTable:[tableQueueUpload class] account:appDelegate.activeAccount];
     
     [appDelegate.netQueue cancelAllOperations];
     [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:appDelegate.activeAccount activeUser:appDelegate.activeUser activeUrl:appDelegate.activeUrl];

iOSClient/Settings/CCManageAccount.m

@@ -285,7 +285,6 @@
     [[NCManageDatabase sharedInstance] clearTable:[tableMetadata class] account:account];
     [[NCManageDatabase sharedInstance] clearTable:[tablePhotoLibrary class] account:account];
     [[NCManageDatabase sharedInstance] clearTable:[tableQueueDownload class] account:account];
-    [[NCManageDatabase sharedInstance] clearTable:[tableQueueUpload class] account:account];
     [[NCManageDatabase sharedInstance] clearTable:[tableShare class] account:account];
     
     // Clear active user

iOSClient/Settings/CCManageAutoUpload.m

@@ -249,7 +249,7 @@
             [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadFull" state:NO];
 
             // remove
-            [[NCManageDatabase sharedInstance] clearTable:[tableQueueUpload class] account:appDelegate.activeAccount];
+//            [[NCManageDatabase sharedInstance] clearTable:[tableQueueUpload class] account:appDelegate.activeAccount];
         }
         
         [self reloadForm];
@@ -294,7 +294,7 @@
             
         } else {
             
-            [[NCManageDatabase sharedInstance] clearTable:[tableQueueUpload class] account:appDelegate.activeAccount];
+//            [[NCManageDatabase sharedInstance] clearTable:[tableQueueUpload class] account:appDelegate.activeAccount];
             
             [[CCNetworking sharedNetworking] settingSessionsDownload:NO upload:YES taskStatus:k_taskStatusCancel activeAccount:appDelegate.activeAccount activeUser:appDelegate.activeUser activeUrl:appDelegate.activeUrl];