Przeglądaj źródła

fix test valid indexPath

Marino Faggiana 6 lat temu
rodzic
commit
33236fc4de
1 zmienionych plików z 8 dodań i 22 usunięć
  1. 8 22
      iOSClient/Photos/CCPhotos.m

+ 8 - 22
iOSClient/Photos/CCPhotos.m

@@ -468,8 +468,10 @@
     
     [ocNetworking downloadThumbnailWithDimOfThumbnail:@"m" fileID:metadata.fileID fileNamePath:[CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:serverUrl activeUrl:appDelegate.activeUrl] fileNameView:metadata.fileNameView success:^{
         
-        if ([[NSFileManager defaultManager] fileExistsAtPath:[CCUtility getDirectoryProviderStorageIconFileID:metadata.fileID fileNameView:metadata.fileNameView]])
+        if ([[NSFileManager defaultManager] fileExistsAtPath:[CCUtility getDirectoryProviderStorageIconFileID:metadata.fileID fileNameView:metadata.fileNameView]] && [self indexPathIsValid:indexPath]) {
+
             [self.collectionView reloadItemsAtIndexPaths:@[indexPath]];
+        }
         
     } failure:^(NSString *message, NSInteger errorCode) {
     }];
@@ -630,6 +632,11 @@
 #pragma mark ==== Collection ====
 #pragma --------------------------------------------------------------------------------------------
 
+- (BOOL)indexPathIsValid:(NSIndexPath *)indexPath
+{
+    return indexPath.section < [self numberOfSectionsInCollectionView:self.collectionView] && indexPath.row < [self collectionView:self.collectionView numberOfItemsInSection:indexPath.section];
+}
+
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
 {    
     return [[sectionDataSource.sectionArrayRow allKeys] count];
@@ -783,27 +790,6 @@
     }
 }
 
-- (BOOL)indexPathIsValid:(NSIndexPath *)indexPath
-{
-    if (!indexPath)
-        return NO;
-    
-    NSInteger section = indexPath.section;
-    NSInteger row = indexPath.row;
-    
-    NSInteger lastSectionIndex = [self numberOfSectionsInCollectionView:self.collectionView] - 1;
-    
-    if (section > lastSectionIndex || lastSectionIndex < 0)
-        return NO;
-    
-    NSInteger rowCount = [self.collectionView numberOfItemsInSection:indexPath.section] - 1;
-    
-    if (rowCount < 0)
-        return NO;
-    
-    return row <= rowCount;
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Navigation ====
 #pragma --------------------------------------------------------------------------------------------