Marino Faggiana hace 6 años
padre
commit
3c9dd64b0d

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -4953,7 +4953,7 @@
         
         metadata = _metadata;
         
-        for (NSString *fileID in _sectionDataSource.allEtag) {
+        for (NSString *fileID in _sectionDataSource.allFileID) {
             tableMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
             if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video] || [metadata.typeFile isEqualToString: k_metadataTypeFile_audio])
                 [allRecordsDataSourceImagesVideos addObject:metadata];

+ 1 - 1
iOSClient/Main/CCSection.h

@@ -26,7 +26,7 @@
 @interface CCSectionDataSourceMetadata : NSObject
     
 @property (nonatomic, strong) NSMutableDictionary *allRecordsDataSource;
-@property (nonatomic, strong) NSMutableArray *allEtag;
+@property (nonatomic, strong) NSMutableArray *allFileID;
 @property (nonatomic, strong) NSMutableArray *sections;
 @property (nonatomic, strong) NSMutableDictionary *sectionArrayRow;
 @property (nonatomic, strong) NSMutableDictionary *fileIDIndexPath;

+ 9 - 4
iOSClient/Main/CCSection.m

@@ -32,7 +32,7 @@
     self = [super init];
     
     _allRecordsDataSource = [[NSMutableDictionary alloc] init];
-    _allEtag  = [[NSMutableArray alloc] init];
+    _allFileID  = [[NSMutableArray alloc] init];
     _sections = [[NSMutableArray alloc] init];
     _sectionArrayRow = [[NSMutableDictionary alloc] init];
     _fileIDIndexPath = [[NSMutableDictionary alloc] init];
@@ -51,7 +51,7 @@
     CCSectionDataSourceMetadata *sectionDataSourceMetadata = [[CCSectionDataSourceMetadata allocWithZone: zone] init];
     
     [sectionDataSourceMetadata setAllRecordsDataSource: self.allRecordsDataSource];
-    [sectionDataSourceMetadata setAllEtag: self.allEtag];
+    [sectionDataSourceMetadata setAllFileID: self.allFileID];
     [sectionDataSourceMetadata setSections: self.sections];
     [sectionDataSourceMetadata setSectionArrayRow: self.sectionArrayRow];
     [sectionDataSourceMetadata setFileIDIndexPath: self.fileIDIndexPath];
@@ -226,7 +226,7 @@
             
             if (metadata.fileID) {
                 
-                [sectionDataSource.allEtag addObject:metadata.fileID];
+                [sectionDataSource.allFileID addObject:metadata.fileID];
                 [sectionDataSource.allRecordsDataSource setObject:metadata forKey:metadata.fileID];
                 [sectionDataSource.fileIDIndexPath setObject:[NSIndexPath indexPathForRow:indexRow inSection:indexSection] forKey:metadata.fileID];
                 
@@ -255,10 +255,15 @@
     return sectionDataSource;
 }
 
++ (CCSectionDataSourceMetadata *)removeObjectsSectionDataSource:(CCSectionDataSourceMetadata *)sectionDataSource forFileID:(NSString *)fileID
+{
+    return sectionDataSource;
+}
+
 + (void)removeAllObjectsSectionDataSource:(CCSectionDataSourceMetadata *)sectionDataSource
 {
     [sectionDataSource.allRecordsDataSource removeAllObjects];
-    [sectionDataSource.allEtag removeAllObjects];
+    [sectionDataSource.allFileID removeAllObjects];
     [sectionDataSource.sections removeAllObjects];
     [sectionDataSource.sectionArrayRow removeAllObjects];
     [sectionDataSource.fileIDIndexPath removeAllObjects];

+ 1 - 1
iOSClient/Photos/CCPhotos.m

@@ -829,7 +829,7 @@
     }
     
     NSMutableArray *allRecordsDataSourceImagesVideos = [NSMutableArray new];
-    for (NSString *fileID in sectionDataSource.allEtag) {
+    for (NSString *fileID in sectionDataSource.allFileID) {
         tableMetadata *metadata = [sectionDataSource.allRecordsDataSource objectForKey:fileID];
         [allRecordsDataSourceImagesVideos addObject:metadata];
     }