account

File Provider Extension/FileProviderExtension+Actions.swift

@@ -304,7 +304,7 @@ extension FileProviderExtension {
         }
         
         // Add, Remove (nil)
-        NCManageDatabase.sharedInstance.addTag(metadata.fileID, tagIOS: tagData)
+        NCManageDatabase.sharedInstance.addTag(metadata.fileID, tagIOS: tagData, account: providerData.account)
         
         guard let parentItemIdentifier = providerData.getParentItemIdentifier(metadata: metadata) else {
             completionHandler(nil, NSFileProviderError(.noSuchItem))

iOSClient/Database/NCManageDatabase.swift

@@ -1887,10 +1887,6 @@ class NCManageDatabase: NSObject {
     
     @objc func getTablePhoto(predicate: NSPredicate) -> tableMetadata? {
         
-        guard self.getAccountActive() != nil else {
-            return nil
-        }
-        
         let realm = try! Realm()
         realm.refresh()
         
@@ -1923,10 +1919,6 @@ class NCManageDatabase: NSObject {
     
     @objc func deletePhotos(fileID: String) {
         
-        guard self.getAccountActive() != nil else {
-            return
-        }
-        
         let realm = try! Realm()
         
         realm.beginWrite()
@@ -2299,11 +2291,7 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Tag
     
-    @objc func addTag(_ fileID: String ,tagIOS: Data?) {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return
-        }
+    @objc func addTag(_ fileID: String ,tagIOS: Data?, account: String) {
         
         let realm = try! Realm()
         
@@ -2313,7 +2301,7 @@ class NCManageDatabase: NSObject {
                 // Add new
                 let addObject = tableTag()
                     
-                addObject.account = tableAccount.account
+                addObject.account = account
                 addObject.fileID = fileID
                 addObject.tagIOS = tagIOS
     
@@ -2371,10 +2359,6 @@ class NCManageDatabase: NSObject {
     
     @objc func addTrashs(_ trashs: [tableTrash]) {
         
-        guard self.getAccountActive() != nil else {
-            return
-        }
-        
         let realm = try! Realm()
         
         do {
@@ -2405,11 +2389,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func deleteTrash(fileID: String?) {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return
-        }
+    @objc func deleteTrash(fileID: String?, account: String) {
         
         let realm = try! Realm()
         var predicate = NSPredicate()
@@ -2418,11 +2398,11 @@ class NCManageDatabase: NSObject {
         
         if fileID == nil {
             
-            predicate = NSPredicate(format: "account == %@", tableAccount.account)
+            predicate = NSPredicate(format: "account == %@", account)
             
         } else {
             
-            predicate = NSPredicate(format: "account = %@ AND fileID = %@", tableAccount.account, fileID!)
+            predicate = NSPredicate(format: "account = %@ AND fileID = %@", account, fileID!)
         }
         
         let result = realm.objects(tableTrash.self).filter(predicate)
@@ -2445,16 +2425,12 @@ class NCManageDatabase: NSObject {
         return Array(results.map { tableTrash.init(value:$0) })
     }
     
-    @objc func getTrashItem(fileID: String) -> tableTrash? {
-        
-        guard let tableAccount = self.getAccountActive() else {
-            return nil
-        }
+    @objc func getTrashItem(fileID: String, account: String) -> tableTrash? {
         
         let realm = try! Realm()
         realm.refresh()
         
-        guard let result = realm.objects(tableTrash.self).filter("account = %@ AND fileID = %@", tableAccount.account, fileID).first else {
+        guard let result = realm.objects(tableTrash.self).filter("account = %@ AND fileID = %@", account, fileID).first else {
             return nil
         }
         

iOSClient/Trash/NCTrash.swift

@@ -271,7 +271,7 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
                 if item is ActionSheetCancelButton { print("Cancel buttons has the value `true`") }
             }
             
-            guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileID: fileID) else {
+            guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileID: fileID, account: appDelegate.activeAccount) else {
                 return
             }
             
@@ -306,7 +306,7 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
                 if item is ActionSheetCancelButton { print("Cancel buttons has the value `true`") }
             }
             
-            guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileID: fileID) else {
+            guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileID: fileID, account: appDelegate.activeAccount) else {
                 return
             }
             
@@ -478,7 +478,7 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
     
     func restoreItem(with fileID: String) {
         
-        guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileID: fileID) else {
+        guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileID: fileID, account: appDelegate.activeAccount) else {
             return
         }
         
@@ -489,7 +489,7 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
         
         ocNetworking?.moveFileOrFolder(fileName, fileNameTo: fileNameTo, success: {
             
-            NCManageDatabase.sharedInstance.deleteTrash(fileID: fileID)
+            NCManageDatabase.sharedInstance.deleteTrash(fileID: fileID, account: self.appDelegate.activeAccount)
             
             self.loadDatasource()
             
@@ -507,7 +507,7 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
             
             if errorCode == 0 {
                 
-                NCManageDatabase.sharedInstance.deleteTrash(fileID: nil)
+                NCManageDatabase.sharedInstance.deleteTrash(fileID: nil, account: self.appDelegate.activeAccount)
                 
                 self.loadDatasource()
 
@@ -519,7 +519,7 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
     
     func deleteItem(with fileID: String) {
         
-        guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileID: fileID) else {
+        guard let tableTrash = NCManageDatabase.sharedInstance.getTrashItem(fileID: fileID, account: appDelegate.activeAccount) else {
             return
         }
         
@@ -531,7 +531,7 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
             
             if errorCode == 0 {
                 
-                NCManageDatabase.sharedInstance.deleteTrash(fileID: fileID)
+                NCManageDatabase.sharedInstance.deleteTrash(fileID: fileID, account: self.appDelegate.activeAccount)
                 
                 self.loadDatasource()