move delete Files Folders on CCActions

iOSClient/Actions/CCActions.swift

@@ -33,26 +33,27 @@ class CCActions: NSObject {
     
     //MARK: Shared Instance
     
-    /*
     static let sharedInstance : CCActions = {
         let instance = CCActions()
         return instance
     }()
-    */
     
     //MARK: Local Variable
     
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
     var metadataNet : CCMetadataNet = CCMetadataNet.init()
     
-    var delegate : CCActionsDelegate?
+    var delegate : CCActionsDelegate!
     
     //MARK: Init
     
     override init() {
     }
     
-    // BARK: Delete
+    // --------------------------------------------------------------------------------------------
+    // MARK: Delete File or Folder
+    // --------------------------------------------------------------------------------------------
+
     func deleteFileOrFolder(_ metadata : CCMetadata, serverUrl : String, delegate : AnyObject) {
         
         let metadataNet : CCMetadataNet = CCMetadataNet.init()
@@ -81,7 +82,7 @@ class CCActions: NSObject {
         } else {
             
             metadataNet.action = actionDeleteFileDirectory
-            metadataNet.delegate = self
+            metadataNet.delegate = delegate
             metadataNet.fileID = metadata.fileID
             metadataNet.fileName = metadata.fileName
             metadataNet.fileNamePrint = metadata.fileNamePrint
@@ -94,7 +95,9 @@ class CCActions: NSObject {
     }
     
     func deleteFileOrFolderSuccess(_ metadataNet : CCMetadataNet) {
-                
+        
+        self.delegate = metadataNet.delegate as! CCActionsDelegate
+        
         CCCoreData.deleteFile(metadataNet.metadata, serverUrl: metadataNet.serverUrl, directoryUser: appDelegate.directoryUser, typeCloud: appDelegate.typeCloud, activeAccount: appDelegate.activeAccount)
         
         delegate?.deleteFileOrFolderSuccess(metadataNet)
@@ -102,10 +105,16 @@ class CCActions: NSObject {
     
     func deleteFileOrFolderFailure(_ metadataNet : CCMetadataNet, message : NSString, errorCode : NSInteger) {
         
+        self.delegate = metadataNet.delegate as! CCActionsDelegate
+        
         if errorCode == 404 {
             CCCoreData.deleteFile(metadataNet.metadata, serverUrl: metadataNet.serverUrl, directoryUser: appDelegate.directoryUser, typeCloud: appDelegate.typeCloud, activeAccount: appDelegate.activeAccount)
         }
 
+        if message.length > 0 {
+            appDelegate.messageNotification("_delete_", description: message as String, visible: true, delay:TimeInterval(dismissAfterSecond), type:TWMessageBarMessageType.error)
+        }
+        
         delegate?.deleteFileOrFolderFailure(metadataNet, message: message, errorCode: errorCode)
     }
 }

iOSClient/Main/CCMain.m

@@ -79,9 +79,6 @@
     // Datasource
     CCSectionDataSource *_sectionDataSource;
     NSDate *_dateReadDataSource;
-    
-    // Actions
-    CCActions *_actions;
 }
 @end
 
@@ -121,7 +118,7 @@
     [super viewDidLoad];
     
     // init object
-    _actions = [CCActions new];
+    //_actions = [CCActions new];
     _metadata = [[CCMetadata alloc] init];
     _metadataSegue = [[CCMetadata alloc] init];
     _hud = [[CCHud alloc] initWithView:[[[UIApplication sharedApplication] delegate] window]];
@@ -135,7 +132,6 @@
     self.tableView.delegate = self;
     self.tableView.tableFooterView = [UIView new];
     self.tableView.separatorColor = COLOR_SEPARATOR_TABLE;
-    _actions.delegate = self;
 
     [[CCNetworking sharedNetworking] settingDelegate:self];
     
@@ -1874,22 +1870,12 @@
     }
 }
 
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Delete File or Folder =====
 #pragma --------------------------------------------------------------------------------------------
 
 - (void)deleteFileOrFolderFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
-    [_hud hideHud];
-    
-    if (errorCode == 404) {
-        [self deleteFileOrFolderSuccess:metadataNet];
-    }
-        
-    if (message)
-        [app messageNotification:@"_delete_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
-
     // is detailViewController active ?
     if (_detailViewController) {
         
@@ -1898,8 +1884,7 @@
         });
     }
     
-    [_selectedMetadatas removeAllObjects];
-    [_queueSelector removeAllObjects];
+    [self deleteFileOrFolderSuccess:metadataNet]; 
 }
 
 - (void)deleteFileOrFolderSuccess:(CCMetadataNet *)metadataNet
@@ -1910,7 +1895,6 @@
         
         [_hud hideHud];
         
-        // Carico la Folder o il Datasource
         if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced]) {
             [self readFolderWithForced:YES];
         } else {
@@ -1939,8 +1923,9 @@
 - (void)deleteFileOrFolder:(CCMetadata *)metadata numFile:(NSInteger)numFile ofFile:(NSInteger)ofFile
 {
     [_queueSelector addObject:selectorDelete];
-    [_actions deleteFileOrFolder:metadata serverUrl:_localServerUrl delegate:self];
     
+    [[CCActions sharedInstance] deleteFileOrFolder:metadata serverUrl:_localServerUrl delegate:self];
+        
     [_hud visibleHudTitle:[NSString stringWithFormat:NSLocalizedString(@"_delete_file_n_", nil), ofFile - numFile + 1, ofFile] mode:MBProgressHUDModeIndeterminate color:nil];
 }
 

iOSClient/Nextcloud-Bridging-Header.h

@@ -5,6 +5,7 @@
 #import "AHKActionSheet.h"
 #import "AppDelegate.h"
 #import "OCNetworking.h"
+#import "TWMessageBarManager.h"
 
 #import <OCCommunicationLib/OCNotifications.h>
 #import <OCCommunicationLib/OCNotificationsAction.h>