Browse Source

Insert the k_directoryID_root

Marino Faggiana 6 years ago
parent
commit
0e7c0d3880
3 changed files with 12 additions and 3 deletions
  1. 3 0
      iOSClient/CCGlobal.h
  2. 8 2
      iOSClient/Main/CCMain.m
  3. 1 1
      iOSClient/Networking/OCNetworking.m

+ 3 - 0
iOSClient/CCGlobal.h

@@ -95,6 +95,9 @@
 // define Nextcloud IOS
 #define k_share_link_middle_part_url_after_version_8    @"index.php/s/"
 
+// directoryID root
+#define k_directoryID_root                              @"00000000-0000-0000-0000-000000000000"
+
 // Constants to identify the different permissions of a file
 #define k_permission_shared                             @"S"
 #define k_permission_can_share                          @"R"

+ 8 - 2
iOSClient/Main/CCMain.m

@@ -1255,6 +1255,10 @@
     
     // insert in Database
     NSMutableArray *metadatasToInsertInDB = (NSMutableArray *)[[NCManageDatabase sharedInstance] addMetadatas:metadatas serverUrl:metadataNet.serverUrl];
+    // insert in Database the /
+    if (metadataFolder != nil) {
+        (void)[[NCManageDatabase sharedInstance] addMetadata:metadataFolder];
+    }
     // reinsert metadatas in Download
     if (metadatasInDownload) {
         (void)[[NCManageDatabase sharedInstance] addMetadatas:metadatasInDownload serverUrl:metadataNet.serverUrl];
@@ -3852,9 +3856,11 @@
     // Controllo data lettura Data Source
     tableDirectory *tableDirectory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", appDelegate.activeAccount, serverUrl]];
     // Get MetadataFolder
-    if (![serverUrl isEqualToString:[CCUtility getHomeServerUrlActiveUrl:appDelegate.activeUrl]])
+    if ([serverUrl isEqualToString:[CCUtility getHomeServerUrlActiveUrl:appDelegate.activeUrl]])
+        _metadataFolder = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND directoryID == %@", appDelegate.activeAccount, k_directoryID_root]];
+    else
         _metadataFolder = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", tableDirectory.fileID]];
-    
+
     NSDate *dateDateRecordDirectory = tableDirectory.dateReadDirectory;
     
     if ([dateDateRecordDirectory compare:_dateReadDataSource] == NSOrderedDescending || dateDateRecordDirectory == nil || _dateReadDataSource == nil) {

+ 1 - 1
iOSClient/Networking/OCNetworking.m

@@ -589,7 +589,7 @@
                         
                         // root folder
                         serverUrlFolder = @"..";
-                        directoryIDFolder = @"00000000-0000-0000-0000-000000000000";
+                        directoryIDFolder = k_directoryID_root;
                         
                         metadataFolder = [CCUtility trasformedOCFileToCCMetadata:itemDtoFolder fileName:@"." serverUrl:serverUrlFolder directoryID:directoryIDFolder autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory activeAccount:account isFolderEncrypted:isFolderEncrypted];