remove browse images

iOSClient/CCGlobal.h

@@ -210,7 +210,6 @@ extern NSString *const BKPasscodeKeychainServiceName;
 // Metadata.Net SELECTOR
 #define selectorAddOffline              @"addOffline"
 #define selectorAddLocal                @"addLocal"
-#define selectorBrowseImages            @"browseImages"
 #define selectorCreateFolder            @"createFolder"
 #define selectorDecryptFile             @"decryptFile"
 #define selectorDelete                  @"delete"

iOSClient/Main/CCDetail.m

@@ -370,8 +370,6 @@
 
 - (void)viewImage
 {
-    BOOL startDownloadBrowseImages = NO;
-    
     self.photoBrowser = [[MWPhotoBrowser alloc] initWithDelegate:self];
     _reload = NO;
     CCMetadata *metadata = [[CCMetadata alloc] init];
@@ -406,16 +404,6 @@
         if (self.metadataDetail.fileID && [metadata.fileID isEqualToString:self.metadataDetail.fileID])
             [self.photoBrowser setCurrentPhotoIndex:index];
         
-        // here we can execute the first browse images
-        if ([self.metadataDetail.sessionSelector isEqualToString:selectorBrowseImages] && startDownloadBrowseImages == NO && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID]] == NO && [metadata.session length] == 0) {
-            
-            NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
-            
-            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorBrowseImages selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:nil];
-            
-            startDownloadBrowseImages = YES;
-        }
-        
         if (metadata.cryptated) {
             
             [self.photos addObject:[MWPhoto photoWithImage:[UIImage imageNamed:image_filePreviewDownloadCrypto]]];
@@ -495,8 +483,8 @@
     if (self.sourceDirectory == sorceDirectoryLocal) directory = self.metadataDetail.directoryID;
     else directory = app.directoryUser;
 
-    // Download self.metadataSegue.sessionSelector = selectorBrowseImages;
-    if (metadata && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directory, metadata.fileID]] == NO && [metadata.session length] == 0 && [self.metadataDetail.sessionSelector isEqualToString:selectorBrowseImages] == NO)
+    // Download
+    if (metadata && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directory, metadata.fileID]] == NO && [metadata.session length] == 0)
         [self performSelector:@selector(downloadPhotoBrowser:) withObject:metadata afterDelay:0.1];
 }
 
@@ -746,16 +734,11 @@
 - (void)downloadPhotoBrowserSuccess:(CCMetadata *)metadataVar selector:(NSString *)selector
 {
     NSUInteger index = 0;
-    BOOL startDownloadBrowseImages;
-    BOOL indexFound = NO;
     
     // if a message for a directory of these
     if (![_dataSourceDirectoryID containsObject:metadataVar.directoryID])
         return;
     
-    // is selector Browse Images ?
-    startDownloadBrowseImages = ([selector isEqualToString:selectorBrowseImages] ? NO : YES);
-    
     for (NSUInteger i=0; i < [self.dataSourceImagesVideos count]; i++ ) {
         
         CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:i];
@@ -764,20 +747,8 @@
         if ([metadataVar.fileID isEqualToString:metadata.fileID]) {
             
             index = i;
-            indexFound = YES;
+            break;
         }
-        
-        // next download browse imgage
-        if (startDownloadBrowseImages == NO && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID]] == NO && [metadata.session length] == 0) {
-            
-            NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
-            
-            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorBrowseImages selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:nil];
-            
-            startDownloadBrowseImages = YES;
-        }
-        
-        if (startDownloadBrowseImages && indexFound) break;
     }
     
     // do not reload is Video on air

iOSClient/Main/CCMain.m

@@ -1202,7 +1202,7 @@
         [CCCoreData deleteFile:metadata serverUrl:serverUrl directoryUser:app.directoryUser typeCloud:app.typeCloud activeAccount:app.activeAccount];
     }
     
-    if ([selector isEqualToString:selectorLoadViewImage] || [selector isEqualToString:selectorBrowseImages]) {
+    if ([selector isEqualToString:selectorLoadViewImage]) {
         
         dispatch_async(dispatch_get_main_queue(), ^{
 
@@ -1385,8 +1385,8 @@
         }
     }
     
-    //selectorLoadViewImage & selectorBrowseImages
-    if ([selector isEqualToString:selectorLoadViewImage] || [selector isEqualToString:selectorBrowseImages]) {
+    //selectorLoadViewImage
+    if ([selector isEqualToString:selectorLoadViewImage]) {
         
         dispatch_async(dispatch_get_main_queue(), ^{
             
@@ -3084,31 +3084,6 @@
     if (indexPath) [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObjects:indexPath, nil] withRowAnimation:UITableViewRowAnimationAutomatic];
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Browse Images =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)browseImages
-{
-    NSArray *records = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND ((typeFile == %@) OR (typeFile == %@))", app.activeAccount, _localDirectoryID, metadataTypeFile_image, metadataTypeFile_video] context:nil];
-    
-    if ([records count] == 0 || [self shouldPerformSegue:_localServerUrl] == NO) {
-        
-        [app messageNotification:@"_info_" description:@"_no_photo_load_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
-        return;
-    }
-    
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.4 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-        
-        _metadataSegue.fileID = nil;
-        _metadataSegue.directoryID = _localDirectoryID;
-        _metadataSegue.sessionSelector = selectorBrowseImages;
-        _metadataSegue.typeFile = metadataTypeFile_image;
-        
-        [self performSegueWithIdentifier:@"segueDetail" sender:self];
-    });
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Order Table & GroupBy & DirectoryOnTop =====
 #pragma --------------------------------------------------------------------------------------------