Browse Source

fix del filter

Marino Faggiana 6 years ago
parent
commit
b3b70f01b5
2 changed files with 4 additions and 13 deletions
  1. 4 2
      iOSClient/Main/NCMainCommon.swift
  2. 0 11
      iOSClient/Trash/NCTrash.swift

+ 4 - 2
iOSClient/Main/NCMainCommon.swift

@@ -574,15 +574,17 @@ class NCMainCommon: NSObject {
                         NCManageDatabase.sharedInstance.deleteE2eEncryption(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameIdentifier == %@", metadata.account, serverUrl, metadata.fileName))
                     }
                     
-                } else {
-                    
                     self.appDelegate.filterFileID.remove(metadata.fileID)
                     
+                } else {
+                    
                     completionErrorCode = errorCode
                     completionMessage = ""
                     if message != nil {
                         completionMessage = message!
                     }
+                    
+                    self.appDelegate.filterFileID.remove(metadata.fileID)
                 }
                 
                 if count == metadatas.count {

+ 0 - 11
iOSClient/Trash/NCTrash.swift

@@ -211,17 +211,6 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             self.datasource = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: "fileName", ascending: true)
             self.collectionView.reloadData()
             
-            // Remove, if exists, fileID in appDelegate.filterFileID
-            for number in 0..<(self.appDelegate.filterFileID.count) {
-                
-                let fileIDDeleted = self.appDelegate.filterFileID[number] as! String
-                
-                if fileIDDeleted.range(of: fileID) != nil {
-                    self.appDelegate.filterFileID.remove(fileIDDeleted)
-                    break
-                }
-            }
-            
         }, failure: { (message, errorCode) in
             
             self.appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)