dev

iOSClient/Main/CCSection.h

@@ -30,6 +30,7 @@
 @property (nonatomic, strong) NSMutableArray *sections;
 @property (nonatomic, strong) NSMutableDictionary *sectionArrayRow;
 @property (nonatomic, strong) NSMutableDictionary *ocIdIndexPath;
+@property (nonatomic, strong) NSMutableArray *metadatas;
 
 @property NSInteger video;
 @property NSInteger image;

iOSClient/Main/CCSection.m

@@ -36,6 +36,7 @@
     _sections = [[NSMutableArray alloc] init];
     _sectionArrayRow = [[NSMutableDictionary alloc] init];
     _ocIdIndexPath = [[NSMutableDictionary alloc] init];
+    _metadatas = [NSMutableArray new];
     
     _image = 0;
     _video = 0;
@@ -55,7 +56,8 @@
     [sectionDataSourceMetadata setSections: self.sections];
     [sectionDataSourceMetadata setSectionArrayRow: self.sectionArrayRow];
     [sectionDataSourceMetadata setOcIdIndexPath: self.ocIdIndexPath];
-    
+    [sectionDataSourceMetadata setMetadatas: self.metadatas];
+
     [sectionDataSourceMetadata setVideo: self.video];
     [sectionDataSourceMetadata setImage: self.image];
     
@@ -78,7 +80,6 @@
 {
     id dataSection;
     
-    NSMutableArray *metadatas = [NSMutableArray new];
     NSMutableDictionary *dictionaryEtagMetadataForIndexPath = [NSMutableDictionary new];
     CCSectionDataSourceMetadata *sectionDataSource = [CCSectionDataSourceMetadata new];
     
@@ -118,34 +119,34 @@
         
         if ([listProgressMetadata objectForKey:metadata.ocId] && [groupByField isEqualToString:@"session"]) {
             
-            [metadatas insertObject:metadata atIndex:0];
+            [ sectionDataSource.metadatas insertObject:metadata atIndex:0];
             
         } else {
             
             if (metadata.directory && directoryOnTop) {
                 if (metadata.favorite) {
-                    [metadatas insertObject:metadata atIndex:numDirectoryFavorite++];
+                    [ sectionDataSource.metadatas insertObject:metadata atIndex:numDirectoryFavorite++];
                     numDirectory++;
                 } else {
-                    [metadatas insertObject:metadata atIndex:numDirectory++];
+                    [ sectionDataSource.metadatas insertObject:metadata atIndex:numDirectory++];
                 }
             } else {
                 if (metadata.favorite && directoryOnTop) {
                     [metadataFilesFavorite addObject:metadata];
                 } else {
-                    [metadatas addObject:metadata];
+                    [ sectionDataSource.metadatas addObject:metadata];
                 }
             }
         }
     }
     if (directoryOnTop && metadataFilesFavorite.count > 0)
-        [metadatas insertObjects:metadataFilesFavorite atIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(numDirectoryFavorite, metadataFilesFavorite.count)]]; // Add Favorite files at end of favorite folders
+        [ sectionDataSource.metadatas insertObjects:metadataFilesFavorite atIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(numDirectoryFavorite, metadataFilesFavorite.count)]]; // Add Favorite files at end of favorite folders
     
     /*
      sectionArrayRow
     */
     
-    for (tableMetadata *metadata in metadatas) {
+    for (tableMetadata *metadata in  sectionDataSource.metadatas) {
         
         if ([metadata.session length] > 0 && [groupByField isEqualToString:@"session"]) {
             

iOSClient/Main/NCDetailViewController.swift

@@ -38,8 +38,9 @@ class NCDetailViewController: UIViewController {
     @objc var mediaFilterImage: Bool = false
     @objc var offlineFilterImage: Bool = false
     
-    @objc  var viewerImageViewController: NCViewerImageViewController?
-    private var metadatas = [tableMetadata]()
+    @objc var viewerImageViewController: NCViewerImageViewController?
+    @objc var metadatas = [tableMetadata]()
+    
     private var progressView: UIProgressView?
     private let progressHeight: CGFloat = 1.5
         

iOSClient/Media/NCMedia.swift

@@ -351,6 +351,7 @@ class NCMedia: UIViewController, DropdownMenuDelegate, DZNEmptyDataSetSource, DZ
             if let segueViewController = segueNavigationController.topViewController as? NCDetailViewController {
             
                 segueViewController.metadata = metadataPush
+                segueViewController.metadatas = sectionDatasource.metadatas as! [tableMetadata]
                 segueViewController.mediaFilterImage = true
             }
         }