clear code

iOSClient/Favorites/CCFavorites.m

@@ -447,7 +447,7 @@
         NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
         tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND e2eEncrypted == 1 AND serverUrl == %@", appDelegate.activeAccount, serverUrl]];
         
-        [[NCMainCommon sharedInstance ] deleteFileWithFilesID:[[NSArray alloc] initWithObjects:metadata.fileID, nil] e2ee:tableDirectory.e2eEncrypted serverUrl:serverUrl folderFileID:tableDirectory.fileID classActive:self completion:^(NSInteger errorCode, NSString *message) {
+        [[NCMainCommon sharedInstance ] deleteFileWithFilesID:[[NSArray alloc] initWithObjects:metadata.fileID, nil] e2ee:tableDirectory.e2eEncrypted serverUrl:serverUrl folderFileID:tableDirectory.fileID completion:^(NSInteger errorCode, NSString *message) {
             [self reloadDatasource];
         }];
     }]];

iOSClient/Main/CCDetail.m

@@ -889,7 +889,7 @@
     NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
     tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND e2eEncrypted == 1 AND serverUrl == %@", appDelegate.activeAccount, serverUrl]];
     
-    [[NCMainCommon sharedInstance ] deleteFileWithFilesID:[[NSArray alloc] initWithObjects:metadata.fileID, nil] e2ee:tableDirectory.e2eEncrypted serverUrl:serverUrl folderFileID:tableDirectory.fileID classActive:self completion:^(NSInteger errorCode, NSString *message) {
+    [[NCMainCommon sharedInstance ] deleteFileWithFilesID:[[NSArray alloc] initWithObjects:metadata.fileID, nil] e2ee:tableDirectory.e2eEncrypted serverUrl:serverUrl folderFileID:tableDirectory.fileID completion:^(NSInteger errorCode, NSString *message) {
         
         if (errorCode == 0) {
             

iOSClient/Main/CCMain.m

@@ -1773,7 +1773,7 @@
     // remove optimization
     _dateReadDataSource = nil;
     
-    [[NCMainCommon sharedInstance ] deleteFileWithFilesID:filesID e2ee:_metadataFolder.e2eEncrypted serverUrl:self.serverUrl folderFileID:_metadataFolder.fileID classActive:self completion:^(NSInteger errorCode, NSString *message) {
+    [[NCMainCommon sharedInstance ] deleteFileWithFilesID:filesID e2ee:_metadataFolder.e2eEncrypted serverUrl:self.serverUrl folderFileID:_metadataFolder.fileID completion:^(NSInteger errorCode, NSString *message) {
         
         // Reload
         if (_isSearchMode)

iOSClient/Main/NCMainCommon.swift

@@ -484,7 +484,7 @@ class NCMainCommon: NSObject {
     
     //MARK: -
     
-    @objc func deleteFile(filesID: NSArray, e2ee: Bool, serverUrl: String, folderFileID: String, classActive: Any, completion: @escaping (_ errorCode: Int, _ message: String)->()) {
+    @objc func deleteFile(filesID: NSArray, e2ee: Bool, serverUrl: String, folderFileID: String, completion: @escaping (_ errorCode: Int, _ message: String)->()) {
         
         let copyFilesID = NSArray(array:filesID as! [Any], copyItems: true)
         
@@ -493,7 +493,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)
                 DispatchQueue.main.async {
                     if error == nil {
-                        self.delete(filesID: copyFilesID, serverUrl:serverUrl, e2ee: e2ee, classActive:classActive, completion: completion)
+                        self.delete(filesID: copyFilesID, serverUrl:serverUrl, e2ee: e2ee, completion: completion)
                     } else {
                         self.appDelegate.messageNotification("_delete_", description: error?.localizedDescription, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: Int(k_CCErrorInternalError))
                         return
@@ -501,11 +501,11 @@ class NCMainCommon: NSObject {
                 }
             }
         } else {
-            delete(filesID: copyFilesID, serverUrl:serverUrl, e2ee: e2ee, classActive:classActive, completion: completion)
+            delete(filesID: copyFilesID, serverUrl:serverUrl, e2ee: e2ee, completion: completion)
         }
     }
     
-    private func delete(filesID: NSArray, serverUrl: String, e2ee: Bool, classActive: Any, completion: @escaping (_ errorCode: Int, _ message: String)->()) {
+    private func delete(filesID: NSArray, serverUrl: String, e2ee: Bool, completion: @escaping (_ errorCode: Int, _ message: String)->()) {
         
         var count: Int = 0
         var completionErrorCode: Int = 0
@@ -523,11 +523,8 @@ class NCMainCommon: NSObject {
                 continue
             }
             
-            if classActive is CCMain {
-                (classActive as! CCMain).fileIDHide.add(metadata.fileID)
-            } else if classActive is CCPhotos {
-                (classActive as! CCPhotos).fileIDHide.add(metadata.fileID)
-            }
+            self.appDelegate.activeMain.fileIDHide.add(metadata.fileID)
+            self.appDelegate.activePhotos.fileIDHide.add(metadata.fileID)
             
             ocNetworking?.deleteFileOrFolder(metadata.fileName, serverUrl: serverUrl, completion: { (message, errorCode) in
                 
@@ -542,7 +539,6 @@ class NCMainCommon: NSObject {
                     NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "fileID == %@", metadata.fileID), clearDateReadDirectoryID: metadata.directoryID)
                     NCManageDatabase.sharedInstance.deleteLocalFile(predicate: NSPredicate(format: "fileID == %@", metadata.fileID))
                     NCManageDatabase.sharedInstance.deletePhotos(fileID: metadata.fileID)
-                    self.appDelegate.activePhotos.fileIDHide.add(metadata.fileID)
                     
                     if metadata.directory {
                         NCManageDatabase.sharedInstance.deleteDirectoryAndSubDirectory(serverUrl: CCUtility.stringAppendServerUrl(serverUrl, addFileName: metadata.fileName))
@@ -554,11 +550,8 @@ class NCMainCommon: NSObject {
                     
                 } else {
                     
-                    if classActive is CCMain {
-                        (classActive as! CCMain).fileIDHide.remove(metadata.fileID)
-                    } else if classActive is CCPhotos {
-                        (classActive as! CCPhotos).fileIDHide.remove(metadata.fileID)
-                    }
+                    self.appDelegate.activeMain.fileIDHide.remove(metadata.fileID)
+                    self.appDelegate.activePhotos.fileIDHide.remove(metadata.fileID)
                     
                     completionErrorCode = errorCode
                     completionMessage = message!
@@ -580,11 +573,8 @@ class NCMainCommon: NSObject {
         }
         
         // reload for filesID
-        if classActive is CCMain {
-            (classActive as! CCMain).reloadDatasource()
-        } else if classActive is CCPhotos {
-            (classActive as! CCPhotos).reloadDatasource()
-        }
+        self.appDelegate.activeMain.reloadDatasource()
+        self.appDelegate.activePhotos.reloadDatasource()
     }
 }
     

iOSClient/Photos/CCPhotos.m

@@ -399,7 +399,7 @@
 
 - (void)deleteFile:(NSArray *)filesID e2ee:(BOOL)e2ee
 {
-    [[NCMainCommon sharedInstance ] deleteFileWithFilesID:filesID e2ee:false serverUrl:@"" folderFileID:@"" classActive:self completion:^(NSInteger errorCode, NSString *message) {
+    [[NCMainCommon sharedInstance ] deleteFileWithFilesID:filesID e2ee:false serverUrl:@"" folderFileID:@"" completion:^(NSInteger errorCode, NSString *message) {
         [self reloadDatasource];
         [self editingModeNO];
     }];