fix fix fix

iOSClient/Brand/Picker.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.20.4</string>
 	<key>CFBundleVersion</key>
-	<string>00004</string>
+	<string>00005</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

iOSClient/Brand/PickerFileProvider.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.20.4</string>
 	<key>CFBundleVersion</key>
-	<string>00004</string>
+	<string>00005</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

iOSClient/Brand/Share.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.20.4</string>
 	<key>CFBundleVersion</key>
-	<string>00004</string>
+	<string>00005</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

iOSClient/Brand/iOSClient.plist

@@ -69,7 +69,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>00004</string>
+	<string>00005</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

iOSClient/Networking/OCNetworking.m

@@ -423,13 +423,13 @@
                 serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
                 
                 if (itemDto.isDirectory && ![serverUrl isEqualToString:[CCUtility getHomeServerUrlActiveUrl:_activeUrl]]) {
-                    isFolderEncrypted = itemDto.isEncrypted;
-                    directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:isFolderEncrypted favorite:itemDto.isFavorite fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:[NSString stringWithFormat:@"%@/%@", serverUrl, fileName]].directoryID;
-                } else {
-                    isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:_metadataNet.account];
-                    directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl];
+                    // Add / update Directory
+                    (void)[[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:itemDto.isEncrypted favorite:itemDto.isFavorite fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:[NSString stringWithFormat:@"%@/%@", serverUrl, fileName]].directoryID;
                 }
                 
+                isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:_metadataNet.account];
+                directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl];
+                
                 [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileName:itemDto.fileName serverUrl:serverUrl directoryID:directoryID autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory activeAccount:_metadataNet.account directoryUser:directoryUser isFolderEncrypted:isFolderEncrypted]];
             }
     
@@ -577,13 +577,13 @@
             serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
             
             if (itemDto.isDirectory) {
-                isFolderEncrypted = itemDto.isEncrypted;
-                directoryID = [[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:isFolderEncrypted favorite:itemDto.isFavorite fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:[NSString stringWithFormat:@"%@/%@", serverUrl, fileName]].directoryID;
-            } else {
-                isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:_metadataNet.account];
-                directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl];
+                // Add / update Directory
+                (void)[[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:itemDto.isEncrypted favorite:itemDto.isFavorite fileID:itemDto.ocId permissions:itemDto.permissions serverUrl:[NSString stringWithFormat:@"%@/%@", serverUrl, fileName]].directoryID;
             }
             
+            isFolderEncrypted = [CCUtility isFolderEncrypted:serverUrl account:_metadataNet.account];
+            directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl];
+            
             [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileName:itemDto.fileName serverUrl:serverUrl directoryID:directoryID autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory activeAccount:_metadataNet.account directoryUser:directoryUser isFolderEncrypted:isFolderEncrypted]];
         }
         

iOSClient/Synchronize/CCSynchronize.m

@@ -305,16 +305,10 @@
         if ([metadataNet.selector isEqualToString:selectorReadFileFolder] || [metadataNet.selector isEqualToString:selectorReadFileFolderWithDownload]) {
             
             NSString *serverUrl = [CCUtility stringAppendServerUrl:metadataNet.serverUrl addFileName:metadataNet.fileName];
-            
-            // Add Directory if do not exists
             tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", metadataNet.account, serverUrl]];
             
-            if (!tableDirectory) {
-                tableDirectory = [[NCManageDatabase sharedInstance] addDirectoryWithEncrypted:metadata.e2eEncrypted  favorite:metadata.favorite fileID:metadata.fileID permissions:metadata.permissions serverUrl:serverUrl];
-            }
-            
             // Verify changed etag
-            if (![tableDirectory.etag isEqualToString:metadata.etag]) {
+            if (![tableDirectory.etag isEqualToString:metadata.etag] && tableDirectory) {
                 
                 if ([metadataNet.selector isEqualToString:selectorReadFileFolder])
                     [self readFolder:serverUrl selector:selectorReadFolder];