Sfoglia il codice sorgente

Fix change status task

Marino Faggiana 7 anni fa
parent
commit
81bc3087c5
2 ha cambiato i file con 24 aggiunte e 12 eliminazioni
  1. 21 9
      iOSClient/Main/CCMain.m
  2. 3 3
      iOSClient/Transfers/CCTransfers.m

+ 21 - 9
iOSClient/Main/CCMain.m

@@ -2388,10 +2388,14 @@
     
     if ([self indexPathIsValid:indexPath]) {
         
-        tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+        tableMetadata *metadataSection = [self getMetadataFromSectionDataSource:indexPath];
         
-        if (metadata)
-            [self reloadTaskButton:metadata];
+        if (metadataSection) {
+            
+            tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadataSection.fileID]];
+            if (metadata)
+                [self reloadTaskButton:metadata];
+        }
     }
 }
 
@@ -2454,10 +2458,14 @@
     
     if ([self indexPathIsValid:indexPath]) {
         
-        tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+        tableMetadata *metadataSection = [self getMetadataFromSectionDataSource:indexPath];
         
-        if (metadata)
-            [self cancelTaskButton:metadata reloadTable:YES];
+        if (metadataSection) {
+            
+            tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadataSection.fileID]];
+            if (metadata)
+                [self cancelTaskButton:metadata reloadTable:YES];
+        }
     }
 }
 
@@ -2520,10 +2528,14 @@
     
     if ([self indexPathIsValid:indexPath]) {
         
-        tableMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
+        tableMetadata *metadataSection = [self getMetadataFromSectionDataSource:indexPath];
         
-        if (metadata)
-            [self stopTaskButton:metadata];
+        if (metadataSection) {
+            
+            tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadataSection.fileID]];
+            if (metadata)
+                [self stopTaskButton:metadata];
+        }
     }
 }
 

+ 3 - 3
iOSClient/Transfers/CCTransfers.m

@@ -182,7 +182,7 @@
     if (indexPath) {
         
         NSString *fileID = [[_sectionDataSource.sectionArrayRow objectForKey:[_sectionDataSource.sections objectAtIndex:indexPath.section]] objectAtIndex:indexPath.row];
-        tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+        tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
         
         if (metadata)
             [app.activeMain reloadTaskButton:metadata];
@@ -217,7 +217,7 @@
     if (indexPath) {
         
         NSString *fileID = [[_sectionDataSource.sectionArrayRow objectForKey:[_sectionDataSource.sections objectAtIndex:indexPath.section]] objectAtIndex:indexPath.row];
-        tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+        tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
         
         if (metadata)
             [app.activeMain cancelTaskButton:metadata reloadTable:YES];
@@ -257,7 +257,7 @@
     if (indexPath) {
         
         NSString *fileID = [[_sectionDataSource.sectionArrayRow objectForKey:[_sectionDataSource.sections objectAtIndex:indexPath.section]] objectAtIndex:indexPath.row];
-        tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
+        tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
         
         if (metadata)
             [app.activeMain stopTaskButton:metadata];