fix

iOSClient/AppDelegate.m

@@ -339,7 +339,7 @@
     // Execute : now
     
     NSLog(@"[LOG] Update Folder Photo");
-    NSString *folderCameraUpload = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPathWithActiveUrl:_activeUrl];
+    NSString *folderCameraUpload = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPathAndNameWithActiveUrl:_activeUrl];
     if ([folderCameraUpload length] > 0)
         [[CCSynchronize sharedSynchronize] readFolderServerUrl:folderCameraUpload directoryID:[[NCManageDatabase sharedInstance] getDirectoryID:folderCameraUpload] selector:selectorReadFolder];
 

iOSClient/Brand/NCBrand.swift

@@ -76,7 +76,7 @@ class NCBrandOptions: NSObject {
     // Auto Upload default folder
     public var folderDefaultCameraUpload:       String = "Photos"
     // Auto Upload brand folder
-    public let folderBrandCameraUpload:         String = NSLocalizedString("_auto_upload_folder_", comment: "")
+    public let folderBrandCameraUpload:         String = ""
     
     // Capabilities Group
     public let capabilitiesGroups:              String = "group.it.twsweb.Crypto-Cloud"

iOSClient/Database/NCManageDatabase.swift

@@ -835,30 +835,29 @@ class NCManageDatabase: NSObject {
         
         let results = realm.objects(tableDirectory.self).filter("account = %@ AND serverUrl BEGINSWITH %@", tableAccount!.account, serverUrl)
         
-        try! realm.write {
+        for result in results {
             
-            for result in results {
-                
-                // delete metadata
-                self.deleteMetadata(predicate: NSPredicate(format: "directoryID = %@", result.directoryID))
-                
-                // delete local file
-                self.deleteLocalFile(predicate: NSPredicate(format: "fileID = %@", result.fileID))
-                
-                /*
-                 // remove if in session
-                 if ([recordMetadata.session length] >0) {
-                 if (recordMetadata.sessionTaskIdentifier >= 0)
-                 [[CCNetworking sharedNetworking] settingSession:recordMetadata.session sessionTaskIdentifier:[recordMetadata.sessionTaskIdentifier integerValue] taskStatus: k_taskStatusCancel];
-                 
-                 if (recordMetadata.sessionTaskIdentifierPlist >= 0)
-                 [[CCNetworking sharedNetworking] settingSession:recordMetadata.session sessionTaskIdentifier:[recordMetadata.sessionTaskIdentifierPlist integerValue] taskStatus: k_taskStatusCancel];
-                 
-                 }
-                 */
-                
-            }
+            // delete metadata
+            self.deleteMetadata(predicate: NSPredicate(format: "directoryID = %@", result.directoryID))
+            
+            // delete local file
+            self.deleteLocalFile(predicate: NSPredicate(format: "fileID = %@", result.fileID))
             
+            /*
+             // remove if in session
+             if ([recordMetadata.session length] >0) {
+             if (recordMetadata.sessionTaskIdentifier >= 0)
+             [[CCNetworking sharedNetworking] settingSession:recordMetadata.session sessionTaskIdentifier:[recordMetadata.sessionTaskIdentifier integerValue] taskStatus: k_taskStatusCancel];
+             
+             if (recordMetadata.sessionTaskIdentifierPlist >= 0)
+             [[CCNetworking sharedNetworking] settingSession:recordMetadata.session sessionTaskIdentifier:[recordMetadata.sessionTaskIdentifierPlist integerValue] taskStatus: k_taskStatusCancel];
+             
+             }
+             */
+        }
+        
+        // Delete table Dirrectory
+        try! realm.write {
             realm.delete(results)
         }
     }
@@ -1336,14 +1335,14 @@ class NCManageDatabase: NSObject {
         
         let results = realm.objects(tableMetadata.self).filter(predicate)
         
-        for result in results {
-            self.setDateReadDirectory(directoryID: result.directoryID)
-        }
-        
         try! realm.write {
             
             realm.delete(results)
         }
+        
+        for result in results {
+            self.setDateReadDirectory(directoryID: result.directoryID)
+        }
     }
     
     func moveMetadata(fileName: String, directoryID: String, directoryIDTo: String) {
@@ -1442,9 +1441,9 @@ class NCManageDatabase: NSObject {
             try! realm.write {
                 results[0].favorite = favorite
             }
-            
-            self.setDateReadDirectory(directoryID: results[0].directoryID)
         }
+        
+        self.setDateReadDirectory(directoryID: results[0].directoryID)
     }
     
     func getMetadata(predicate: NSPredicate) -> tableMetadata? {
@@ -1489,7 +1488,7 @@ class NCManageDatabase: NSObject {
         
         if (results.count > 0) {
             
-            return Array(convertMetadataToUnmanagedMetadata(results)!)
+            return Array(convertMetadataToUnmanagedMetadata(results))
             
         } else {
             
@@ -1666,17 +1665,12 @@ class NCManageDatabase: NSObject {
         return copyMetadata
     }
     
-    func convertMetadataToUnmanagedMetadata(_ metadatas: Results<tableMetadata>?) -> [tableMetadata]? {
+    func convertMetadataToUnmanagedMetadata(_ metadatas: Results<tableMetadata>) -> [tableMetadata] {
         
         var unmanageMetadatas = [tableMetadata]()
         
-        if metadatas == nil {
-            return nil
-        } else {
-            
-            for metadata in metadatas! {
-                unmanageMetadatas.append(tableMetadata.init(value: metadata))
-            }
+        for metadata in metadatas {
+            unmanageMetadatas.append(tableMetadata.init(value: metadata))
         }
         
         return unmanageMetadatas

iOSClient/Favorites/CCSynchronize.m

@@ -159,6 +159,7 @@
 
 - (void)listingFavoritesFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
+    NSLog(@"Read Favorites Failure");
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Main/CCDetail.m

@@ -216,13 +216,9 @@
     // verifico se esiste l'icona e se la posso creare
     if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@.ico", app.directoryUser, self.metadataDetail.fileID]] == NO) {
         
-        id tradeReference = [[NCManageDatabase sharedInstance] getThreadConfined:self.metadataDetail];
-        
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),^{
-            
-            tableMetadata *metadataThread = (tableMetadata *)[[NCManageDatabase sharedInstance] putThreadConfined:tradeReference];
-            
-            [CCGraphics createNewImageFrom:metadataThread.fileID directoryUser:app.directoryUser fileNameTo:metadataThread.fileID fileNamePrint:metadataThread.fileNamePrint size:@"m" imageForUpload:NO typeFile:metadataThread.typeFile writePreview:YES optimizedFileName:[CCUtility getOptimizedPhoto]];
+                    
+            [CCGraphics createNewImageFrom:self.metadataDetail.fileID directoryUser:app.directoryUser fileNameTo:self.metadataDetail.fileID fileNamePrint:self.metadataDetail.fileNamePrint size:@"m" imageForUpload:NO typeFile:self.metadataDetail.typeFile writePreview:YES optimizedFileName:[CCUtility getOptimizedPhoto]];
         });
     }
     

iOSClient/Main/CCMain.m

@@ -1945,7 +1945,7 @@
     BOOL isDirectoryOutOfDate = true;
     tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"serverUrl = %@", serverUrl]];
     
-    if (directory) {
+    if (directory.dateReadDirectory) {
     
         // Is Directory Out Of Date ?
         NSDateComponents *dateComponents = [NSDateComponents new];

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -529,7 +529,7 @@
     
     if (_sectionDataSource) {
         
-        //dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
             
             NSArray *metadatas = [[NCManageDatabase sharedInstance] getTableMetadatasPhotosCameraUploadWithServerUrl:serverUrl];
             
@@ -538,7 +538,7 @@
             dispatch_async(dispatch_get_main_queue(), ^{
                 [self reloadCollection];
             });
-        //});
+        });
 
     } else {