Browse Source

dev Photos

Marino Faggiana 6 years ago
parent
commit
42490d77bf
1 changed files with 9 additions and 4 deletions
  1. 9 4
      iOSClient/Photos/CCPhotos.m

+ 9 - 4
iOSClient/Photos/CCPhotos.m

@@ -34,7 +34,6 @@
     tableMetadata *metadata;
     NSMutableArray *selectedMetadatas;
     NSMutableArray *fileIDHide;
-    NSArray *metadatasSectionDataSource;
     CCSectionDataSourceMetadata *sectionDataSource;
     
     CCHud *hud;
@@ -598,8 +597,8 @@
     
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
-            metadatasSectionDataSource = [[NCManageDatabase sharedInstance] getTablePhotos];
-            sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatasSectionDataSource listProgressMetadata:nil groupByField:@"date" fileIDHide:fileIDHide activeAccount:appDelegate.activeAccount];
+            NSArray *metadatas = [[NCManageDatabase sharedInstance] getTablePhotos];
+            sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:metadatas listProgressMetadata:nil groupByField:@"date" fileIDHide:fileIDHide activeAccount:appDelegate.activeAccount];
         
             dispatch_async(dispatch_get_main_queue(), ^{
                
@@ -847,7 +846,13 @@
         self.detailViewController = segue.destinationViewController;
     }
     
-    self.detailViewController.dataSourceImagesVideos = (NSMutableArray *)metadatasSectionDataSource;
+    NSMutableArray *allRecordsDataSourceImagesVideos = [NSMutableArray new];
+    for (NSString *fileID in sectionDataSource.allEtag) {
+        tableMetadata *metadata = [sectionDataSource.allRecordsDataSource objectForKey:fileID];
+        [allRecordsDataSourceImagesVideos addObject:metadata];
+    }
+    
+    self.detailViewController.dataSourceImagesVideos = allRecordsDataSourceImagesVideos;
     self.detailViewController.metadataDetail = metadata;
     self.detailViewController.dateFilterQuery = metadata.date;