trasnfer

iOSClient/AppDelegate.h

@@ -37,6 +37,7 @@
 #import "CCPhotos.h"
 #import "CCSettings.h"
 #import "CCFavorites.h"
+#import "CCTransfers.h"
 
 @class CCLoginWeb;
 
@@ -113,6 +114,7 @@
 @property (nonatomic, retain) CCDetail *activeDetail;
 @property (nonatomic, retain) CCSettings *activeSettings;
 @property (nonatomic, retain) CCActivity *activeActivity;
+@property (nonatomic, retain) CCTransfers *activeTransfers;
 @property (nonatomic, retain) CCLogin *activeLogin;
 @property (nonatomic, retain) CCLoginWeb *activeLoginWeb;
 

iOSClient/Main/CCMain.h

@@ -79,6 +79,7 @@
 - (void)uploadFileAsset:(NSMutableArray *)assets serverUrl:(NSString *)serverUrl useSubFolder:(BOOL)useSubFolder session:(NSString *)session;
 
 - (void)cancelTaskButton:(tableMetadata *)metadata reloadTable:(BOOL)reloadTable;
+- (void)cancelAllTask:(id)sender;
 
 - (void)reloadDatasource;
 - (void)reloadDatasource:(NSString *)serverUrl;

iOSClient/Main/CCMain.m

@@ -4083,13 +4083,13 @@
             [main reloadDatasource];
         } else {
             [self tableViewReloadData];
-//            [appDelegate.activeTransfers reloadDatasource];
+            [appDelegate.activeTransfers reloadDatasource];
         }
         
         return;
     }
     
-//    [appDelegate.activeTransfers reloadDatasource];
+    [appDelegate.activeTransfers reloadDatasource];
     
     // Settaggio variabili per le ottimizzazioni
     _directoryGroupBy = [CCUtility getGroupBySettings];

iOSClient/Transfers/CCTransfers.m

@@ -57,6 +57,8 @@
 
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(triggerProgressTask:) name:@"NotificationProgressTask" object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeTheming) name:@"changeTheming" object:nil];
+        
+        appDelegate.activeTransfers = self;
     }
     return self;
 }
@@ -201,25 +203,9 @@
     }
 }
 
-- (void)cancelAllTask
+- (void)cancelAllTask:(id)sender
 {
-    if (appDelegate.activeMain == nil)
-        return;
-    
-    BOOL lastAndRefresh = NO;
-    
-    for (NSString *key in sectionDataSource.allRecordsDataSource.allKeys) {
-        
-        if ([key isEqualToString:[sectionDataSource.allRecordsDataSource.allKeys lastObject]])
-            lastAndRefresh = YES;
-        
-        tableMetadata *metadata = [sectionDataSource.allRecordsDataSource objectForKey:key];
-        
-        if ([metadata.session containsString:@"upload"] && ((metadata.sessionTaskIdentifier == k_taskIdentifierDone) || (metadata.sessionTaskIdentifier >= 0)))
-            continue;
-        
-        [appDelegate.activeMain cancelTaskButton:metadata reloadTable:lastAndRefresh];
-    }
+    [appDelegate.activeMain cancelAllTask:sender];
 }
 
 #pragma --------------------------------------------------------------------------------------------