Browse Source

improvements delete

Marino Faggiana 6 years ago
parent
commit
8712ded1e0
3 changed files with 16 additions and 5 deletions
  1. 1 0
      iOSClient/Main/CCMain.h
  2. 2 1
      iOSClient/Main/CCMain.m
  3. 13 4
      iOSClient/Main/NCMainCommon.swift

+ 1 - 0
iOSClient/Main/CCMain.h

@@ -64,6 +64,7 @@
 @property (nonatomic, strong) UIView *reMenuBackgroundView;
 @property (nonatomic, strong) UIView *reMenuBackgroundView;
 @property (nonatomic, strong) UITapGestureRecognizer *singleFingerTap;
 @property (nonatomic, strong) UITapGestureRecognizer *singleFingerTap;
 @property (nonatomic, strong) UIImage *imageTitle;
 @property (nonatomic, strong) UIImage *imageTitle;
+@property (nonatomic, strong) NSMutableArray *fileIDHide;
 @property BOOL isSelectedMode;
 @property BOOL isSelectedMode;
 
 
 
 

+ 2 - 1
iOSClient/Main/CCMain.m

@@ -135,6 +135,7 @@
     _searchFileName = @"";
     _searchFileName = @"";
     _noFilesSearchTitle = @"";
     _noFilesSearchTitle = @"";
     _noFilesSearchDescription = @"";
     _noFilesSearchDescription = @"";
+    self.fileIDHide = [NSMutableArray new];
     
     
     // delegate
     // delegate
     self.tableView.delegate = self;
     self.tableView.delegate = self;
@@ -3866,7 +3867,7 @@
             }
             }
         }
         }
         
         
-        sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:_directoryGroupBy fileIDHide:nil activeAccount:appDelegate.activeAccount];
+        sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:_directoryGroupBy fileIDHide:self.fileIDHide activeAccount:appDelegate.activeAccount];
 
 
         [self tableViewReloadData];
         [self tableViewReloadData];
         
         

+ 13 - 4
iOSClient/Main/NCMainCommon.swift

@@ -500,7 +500,7 @@ class NCMainCommon: NSObject {
                 let error = NCNetworkingEndToEnd.sharedManager().lockFolderEncrypted(onServerUrl: serverUrl, fileID: folderFileID, user: self.appDelegate.activeUser, userID: self.appDelegate.activeUserID, password: self.appDelegate.activePassword, url: self.appDelegate.activeUrl)
                 let error = NCNetworkingEndToEnd.sharedManager().lockFolderEncrypted(onServerUrl: serverUrl, fileID: folderFileID, user: self.appDelegate.activeUser, userID: self.appDelegate.activeUserID, password: self.appDelegate.activePassword, url: self.appDelegate.activeUrl)
                 DispatchQueue.main.async {
                 DispatchQueue.main.async {
                     if error == nil {
                     if error == nil {
-                        self.delete(metadatas: metadatas, e2ee: e2ee, completion: completion)
+                        self.delete(metadatas: metadatas, serverUrl:serverUrl, e2ee: e2ee, completion: completion)
                     } else {
                     } else {
                         self.appDelegate.messageNotification("_delete_", description: error?.localizedDescription, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: Int(k_CCErrorInternalError))
                         self.appDelegate.messageNotification("_delete_", description: error?.localizedDescription, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: Int(k_CCErrorInternalError))
                         return
                         return
@@ -508,11 +508,11 @@ class NCMainCommon: NSObject {
                 }
                 }
             }
             }
         } else {
         } else {
-            delete(metadatas: metadatas, e2ee: e2ee, completion: completion)
+            delete(metadatas: metadatas, serverUrl:serverUrl, e2ee: e2ee, completion: completion)
         }
         }
     }
     }
     
     
-    private func delete(metadatas: NSArray, e2ee: Bool,  completion: @escaping (_ errorCode: Int, _ message: String)->()) {
+    private func delete(metadatas: NSArray, serverUrl: String,e2ee: Bool,  completion: @escaping (_ errorCode: Int, _ message: String)->()) {
         
         
         var count: Int = 0
         var count: Int = 0
         var completionErrorCode: Int = 0
         var completionErrorCode: Int = 0
@@ -526,6 +526,9 @@ class NCMainCommon: NSObject {
                 continue
                 continue
             }
             }
             
             
+            self.appDelegate.activePhotos.fileIDHide.add(metadata.fileID)
+            self.appDelegate.activeMain.fileIDHide.add(metadata.fileID)
+            
             ocNetworking?.deleteFileOrFolder(metadata.fileName, serverUrl: serverUrl, completion: { (message, errorCode) in
             ocNetworking?.deleteFileOrFolder(metadata.fileName, serverUrl: serverUrl, completion: { (message, errorCode) in
                 
                 
                 count += 1
                 count += 1
@@ -549,6 +552,10 @@ class NCMainCommon: NSObject {
                         NCManageDatabase.sharedInstance.deleteE2eEncryption(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameIdentifier == %@", metadata.account, serverUrl, metadata.fileName))
                         NCManageDatabase.sharedInstance.deleteE2eEncryption(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileNameIdentifier == %@", metadata.account, serverUrl, metadata.fileName))
                     }
                     }
                 } else {
                 } else {
+                    
+                    self.appDelegate.activePhotos.fileIDHide.remove(metadata.fileID)
+                    self.appDelegate.activeMain.fileIDHide.remove(metadata.fileID)
+
                     completionErrorCode = errorCode
                     completionErrorCode = errorCode
                     completionMessage = message!
                     completionMessage = message!
                 }
                 }
@@ -567,11 +574,13 @@ class NCMainCommon: NSObject {
                 }
                 }
             })
             })
         }
         }
+        
+        self.reloadDatasource(ServerUrl: serverUrl)
     }
     }
 }
 }
     
     
 //MARK: -
 //MARK: -
-    
+
 class CCMainTabBarController : UITabBarController, UITabBarControllerDelegate {
 class CCMainTabBarController : UITabBarController, UITabBarControllerDelegate {
         
         
     override func viewDidLoad() {
     override func viewDidLoad() {