marinofaggiana 4 years ago
parent
commit
228178e15b

+ 10 - 2
iOSClient/Favorites/NCFavorite.swift

@@ -306,9 +306,17 @@ class NCFavorite: UIViewController, UIGestureRecognizerDelegate, NCListCellDeleg
     func tapMoreGridItem(with objectId: String, namedButtonMore: String, sender: Any) {
         
         guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", objectId)) else { return }
-        guard let tabBarController = self.tabBarController else { return }
+                   
         
-        toggleMoreMenu(viewController: tabBarController, metadata: metadata)
+        if namedButtonMore == "more" {
+        
+            guard let tabBarController = self.tabBarController else { return }
+            toggleMoreMenu(viewController: tabBarController, metadata: metadata)
+            
+        } else if namedButtonMore == "stop" {
+            
+            NCMainCommon.sharedInstance.cancelTransferMetadata(metadata, uploadStatusForcedStart: false)
+        }
     }
     
     // MARK: SEGUE

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -1490,7 +1490,7 @@
         tableMetadata *metadataSection = [[NCMainCommon sharedInstance] getMetadataFromSectionDataSourceIndexPath:indexPath sectionDataSource:sectionDataSource];
         
         if (metadataSection) {
-            [[NCMainCommon sharedInstance] cancelTransferMetadata:metadataSection reloadDatasource:true uploadStatusForcedStart:false];
+            [[NCMainCommon sharedInstance] cancelTransferMetadata:metadataSection uploadStatusForcedStart:false];
         }
     }
 }

+ 2 - 2
iOSClient/Main/NCMainCommon.swift

@@ -134,7 +134,7 @@ class NCMainCommon: NSObject, NCAudioRecorderViewControllerDelegate, UIDocumentI
         }
     }
     
-    @objc func cancelTransferMetadata(_ metadata: tableMetadata, reloadDatasource: Bool, uploadStatusForcedStart: Bool) {
+    @objc func cancelTransferMetadata(_ metadata: tableMetadata, uploadStatusForcedStart: Bool) {
         
         if metadata.session.count == 0 {
             NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
@@ -205,7 +205,7 @@ class NCMainCommon: NSObject, NCAudioRecorderViewControllerDelegate, UIDocumentI
                 
                 // Cancel Task
                 if metadata.status == k_metadataStatusDownloading || metadata.status == k_metadataStatusUploading {
-                    self.cancelTransferMetadata(metadata, reloadDatasource: false, uploadStatusForcedStart: false)
+                    self.cancelTransferMetadata(metadata, uploadStatusForcedStart: false)
                 }
             }
         }

+ 2 - 2
iOSClient/Transfers/CCTransfers.m

@@ -217,7 +217,7 @@
         tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"ocId = %@", ocId]];
         
         if (metadata)
-            [[NCMainCommon sharedInstance] cancelTransferMetadata:metadata reloadDatasource:true uploadStatusForcedStart:false];
+            [[NCMainCommon sharedInstance] cancelTransferMetadata:metadata uploadStatusForcedStart:false];
     }
 }
 
@@ -246,7 +246,7 @@
 - (void)startTask:(id)sender
 {
     if (metadataForRecognizer.status == k_metadataStatusUploading) {
-        [[NCMainCommon sharedInstance] cancelTransferMetadata:metadataForRecognizer reloadDatasource:false uploadStatusForcedStart:true];
+        [[NCMainCommon sharedInstance] cancelTransferMetadata:metadataForRecognizer uploadStatusForcedStart:true];
     } else {
         tableMetadata *metadata = [[NCManageDatabase sharedInstance] copyObjectWithMetadata:metadataForRecognizer];
         metadata.status = k_metadataStatusInUpload;