Auto-upload must be enabled to display images in Photos tab #498

iOSClient/AppDelegate.m

@@ -306,9 +306,6 @@
     if (self.maintenanceMode)
         return;
 
-    NSLog(@"[LOG] Update contenttype image for Photos Tab");
-    [[CCSynchronize sharedSynchronize] searchContentType:@[@"image/%", @"video/%"] selector:selectorSearchContentType];
-    
     // verify Upload
     [self verifyUploadInErrorOrWait];
 
@@ -324,7 +321,10 @@
         
     NSLog(@"[LOG] Initialize Auto upload");
     [[NCAutoUpload sharedInstance] initStateAutoUpload];
-        
+    
+    NSLog(@"[LOG] Update contenttype image for Photos Tab");
+    [_activePhotos readPhotoVideo];
+    
     NSLog(@"[LOG] Listning Favorites");
     [_activeFavorites readListingFavorites];
 }

iOSClient/Photos/CCPhotos.h

@@ -44,5 +44,6 @@
 - (void)downloadFileSuccessFailure:(NSString *)fileName fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost errorMessage:(NSString *)errorMessage errorCode:(NSInteger)errorCode;
 
 - (void)reloadDatasourceForced;
+- (void)readPhotoVideo;
 
 @end

iOSClient/Photos/CCPhotos.m

@@ -287,7 +287,9 @@
 
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
 {
-    NSString *text = [NSString stringWithFormat:@"\n%@", NSLocalizedString(@"_tutorial_photo_view_", nil)];
+    NSString *text;
+    
+    text = [NSString stringWithFormat:@"\n%@", NSLocalizedString(@"_tutorial_photo_view_", nil)];
     
     NSDictionary *attributes = @{NSFontAttributeName:[UIFont boldSystemFontOfSize:20.0f], NSForegroundColorAttributeName:[UIColor lightGrayColor]};
     
@@ -524,6 +526,54 @@
     //float progress = [[dict valueForKey:@"progress"] floatValue];
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ==== readPhotoVideo ====
+#pragma --------------------------------------------------------------------------------------------
+
+- (void)searchFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
+{
+    //NSLog
+}
+
+- (void)searchSuccess:(CCMetadataNet *)metadataNet metadatas:(NSArray *)metadatas
+{
+    // Check Active Account
+    if (![metadataNet.account isEqualToString:appDelegate.activeAccount])
+        return;
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
+        
+        NSMutableArray *addMetadatas = [NSMutableArray new];
+        
+        for (tableMetadata *metadata in metadatas) {
+            
+            // Verify if do not exists this Metadata
+            tableMetadata *result = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
+            
+            if (!result)
+                [addMetadatas addObject:metadata];
+        }
+        
+        if ([addMetadatas count] > 0) {
+            
+            (void)[[NCManageDatabase sharedInstance] addMetadatas:addMetadatas serverUrl:metadataNet.serverUrl];
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self reloadDatasourceForced];
+            });
+        }
+    });
+}
+
+- (void)readPhotoVideo
+{
+    // test
+    if (appDelegate.activeAccount.length == 0)
+        return;
+    
+    [[CCActions sharedInstance] search:@"" fileName:@"" depth:@"infinity" date:[NSDate date] contenType:@[@"image/%", @"video/%"] selector:selectorSearchContentType delegate:self];
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ==== Collection ====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Synchronize/CCSynchronize.h

@@ -39,7 +39,6 @@
 - (void)readFolder:(NSString *)serverUrl selector:(NSString *)selector;
 - (void)readFileForFolder:(NSString *)fileName serverUrl:(NSString *)serverUrl selector:(NSString *)selector;
 - (void)readFile:(tableMetadata *)metadata selector:(NSString *)selector;
-- (void)searchContentType:(NSArray *)contentType selector:(NSString *)selector;
 
 - (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account withDownload:(BOOL)withDownload;
 

iOSClient/Synchronize/CCSynchronize.m

@@ -319,58 +319,6 @@
     });
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Search =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)searchFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
-{
-    //NSLog
-}
-
-- (void)searchSuccess:(CCMetadataNet *)metadataNet metadatas:(NSArray *)metadatas
-{
-    // Check Active Account
-    if (![metadataNet.account isEqualToString:appDelegate.activeAccount])
-        return;
-    
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
-        
-        NSMutableArray *addMetadatas = [NSMutableArray new];
-        
-        for (tableMetadata *metadata in metadatas) {
-    
-            // Verify if do not exists this Metadata
-            tableMetadata *result = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
-                
-            if (!result)
-                [addMetadatas addObject:metadata];
-        }
-        
-        if ([addMetadatas count] > 0) {
-            (void)[[NCManageDatabase sharedInstance] addMetadatas:addMetadatas serverUrl:metadataNet.serverUrl];
-        }
-        
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [appDelegate.activePhotos reloadDatasourceForced];
-        });
-    });
-}
-
-- (void)searchContentType:(NSArray *)contentType selector:(NSString *)selector
-{
-    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:appDelegate.activeAccount];
-    
-    metadataNet.action = actionSearch;
-    metadataNet.contentType = contentType;
-    metadataNet.date = [NSDate date];
-    metadataNet.depth = @"infinity";
-    metadataNet.priority = NSOperationQueuePriorityLow;
-    metadataNet.selector = selector;
-
-    [appDelegate addNetworkingOperationQueue:appDelegate.netQueue delegate:self metadataNet:metadataNet];
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Verify Metadatas =====
 #pragma --------------------------------------------------------------------------------------------