Improvements code

iOSClient/AutoUpload/NCAutoUpload.m

@@ -486,7 +486,7 @@
     
     if ([ocNetworking automaticCreateFolderSync:folderPhotos]) {
         
-        (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:folderPhotos permissions:@""];
+        (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:folderPhotos permissions:nil];
         
     } else {
         
@@ -506,7 +506,7 @@
             
             if ([ocNetworking automaticCreateFolderSync:[NSString stringWithFormat:@"%@/%@", folderPhotos, dateSubFolder]]) {
                 
-                (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:[NSString stringWithFormat:@"%@/%@", folderPhotos, dateSubFolder] permissions:@""];
+                (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:[NSString stringWithFormat:@"%@/%@", folderPhotos, dateSubFolder] permissions:nil];
                 
             } else {
                 

iOSClient/Database/NCManageDatabase.swift

@@ -668,7 +668,7 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Directory
     
-    func addDirectory(serverUrl: String, permissions: String) -> String {
+    func addDirectory(serverUrl: String, permissions: String?) -> String {
         
         guard let tableAccount = self.getAccountActive() else {
             return ""
@@ -691,13 +691,17 @@ class NCManageDatabase: NSObject {
                     directoryID = NSUUID().uuidString
                     addObject.directoryID = directoryID
                 
-                    addObject.permissions = permissions
+                    if let permissions = permissions {
+                        addObject.permissions = permissions
+                    }
                     addObject.serverUrl = serverUrl
                     realm.add(addObject, update: true)
                 
                 } else {
                 
-                    result?.permissions = permissions
+                    if let permissions = permissions {
+                        result!.permissions = permissions
+                    }
                     directoryID = result!.directoryID
                     realm.add(result!, update: true)
                 }
@@ -843,7 +847,7 @@ class NCManageDatabase: NSObject {
         let realm = try! Realm()
         
         guard let result = realm.objects(tableDirectory.self).filter("account = %@ AND serverUrl = %@", tableAccount.account,serverUrl).first else {
-            return self.addDirectory(serverUrl: serverUrl, permissions: "")
+            return self.addDirectory(serverUrl: serverUrl, permissions: nil)
         }
         
         return result.directoryID

iOSClient/Main/CCMain.m

@@ -2306,7 +2306,7 @@
             
             // Add new directory
             NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", serverUrlTo, fileName];
-            (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:newDirectory permissions:@""];
+            (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:newDirectory permissions:nil];
         }
     
         // next
@@ -2499,7 +2499,7 @@
 - (void)createFolderSuccess:(CCMetadataNet *)metadataNet
 {
     NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName];    
-    (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:newDirectory permissions:@""];
+    (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:newDirectory permissions:nil];
     
     if (metadataNet.cryptated == NO) {
     
@@ -4733,16 +4733,6 @@
         return;
     }
     
-    /*
-    // Reload Favorite & Photo is active
-    NSInteger indexActiveTabBar = self.tabBarController.selectedIndex;
-    if (indexActiveTabBar == k_tabBarApplicationIndexFavorite) {
-        app.activeFavorites.reloadDatasource;
-    } else if (indexActiveTabBar == k_tabBarApplicationIndexPhotos) {
-        app.activePhotos.reloadDatasource;
-    }
-    */ 
-    
     // Reload -> Self se non siamo nella dir appropriata cercala e se è in memoria reindirizza il reload
     if ([serverUrl isEqualToString:_serverUrl] == NO || _serverUrl == nil) {
         

iOSClient/Move/CCMove.m

@@ -434,7 +434,7 @@
 
 - (void)createFolderSuccess:(CCMetadataNet *)metadataNet
 {
-    (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] permissions:@""];
+    (void)[[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] permissions:nil];
     
     // Load Folder or the Datasource
     [self readFolder];

iOSClient/Synchronize/CCSynchronize.m

@@ -67,7 +67,7 @@
     NSString *directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl];
     if (!directoryID) return;
     
-        metadataNet.depth = @"1";
+    metadataNet.depth = @"1";
     metadataNet.directoryID = directoryID;
     metadataNet.priority = NSOperationQueuePriorityLow;
     metadataNet.selector = selector;
@@ -309,10 +309,12 @@
             
             NSString *serverUrl = [CCUtility stringAppendServerUrl:metadataNet.serverUrl addFileName:metadataNet.fileName];
             
+            // Add Directory
+            (void) [[NCManageDatabase sharedInstance] addDirectoryWithServerUrl:metadataNet.account permissions:nil];
             tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", metadataNet.account, serverUrl]];
             
             // Verify changed etag
-            if (![tableDirectory.etag isEqualToString:metadata.etag] && tableDirectory) {
+            if (![tableDirectory.etag isEqualToString:metadata.etag]) {
                 
                 if ([metadataNet.selector isEqualToString:selectorReadFileFolder])
                     [self readFolder:serverUrl selector:selectorReadFolder];