Marino Faggiana 6 lat temu
rodzic
commit
fa676640ba

+ 0 - 1
iOSClient/Favorites/CCFavorites.m

@@ -172,7 +172,6 @@
     
     metadataNet.action = actionReadFolder;
     metadataNet.depth = @"1";
-    metadataNet.directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrl account:appDelegate.activeAccount];
     
     if ([CCUtility getFavoriteOffline])
         selector = selectorReadFolderWithDownload;

+ 0 - 4
iOSClient/Main/CCMain.m

@@ -1328,7 +1328,6 @@
     metadataNet.action = actionReadFolder;
     metadataNet.date = [NSDate date];
     metadataNet.depth = @"1";
-    metadataNet.directoryID = directory.directoryID;
     metadataNet.priority = NSOperationQueuePriorityHigh;
     metadataNet.selector = selectorReadFolder;
     metadataNet.serverUrl = serverUrl;
@@ -1381,7 +1380,6 @@
     metadataNet.action = actionSearch;
     metadataNet.contentType = nil;
     metadataNet.date = nil;
-    metadataNet.directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:startDirectory account:appDelegate.activeAccount];
     metadataNet.fileName = _searchFileName;
     metadataNet.etag = @"";
     metadataNet.depth = @"infinity";
@@ -1422,7 +1420,6 @@
         CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:appDelegate.activeAccount];
             
         metadataNet.account = appDelegate.activeAccount;
-        metadataNet.directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:_serverUrl account:appDelegate.activeAccount];
         metadataNet.selector = selectorSearchFiles;
         metadataNet.serverUrl = _serverUrl;
 
@@ -1753,7 +1750,6 @@
         metadataNet.action = actionMoveFileOrFolder;
         metadataNet.directory = metadata.directory;
         metadataNet.fileID = metadata.fileID;
-        metadataNet.directoryIDTo = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrlTo account:appDelegate.activeAccount];
         metadataNet.fileName = metadata.fileName;
         metadataNet.fileNameView = metadata.fileNameView;
         metadataNet.fileNameTo = metadata.fileName;

+ 0 - 1
iOSClient/Media/CCMedia.m

@@ -733,7 +733,6 @@
             metadataNet.action = actionSearch;
             metadataNet.contentType = @[@"image/%", @"video/%"];
             metadataNet.date = [NSDate distantPast];
-            metadataNet.directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:startDirectory account:appDelegate.activeAccount];
             metadataNet.fileName = @"";
             metadataNet.etag = metadata.etag;
             metadataNet.depth = @"infinity";

+ 0 - 2
iOSClient/Networking/CCNetworking.h

@@ -86,8 +86,6 @@
 @property (nonatomic, weak) id delegate;
 @property (nonatomic, strong) NSString *depth;
 @property BOOL directory;
-@property (nonatomic, strong) NSString *directoryID;
-@property (nonatomic, strong) NSString *directoryIDTo;
 @property (nonatomic, strong) NSString *encryptedMetadata;
 @property (nonatomic, strong) NSString *etag;
 @property (nonatomic, strong) NSString *expirationTime;

+ 0 - 2
iOSClient/Networking/CCNetworking.m

@@ -1329,8 +1329,6 @@
     [metadataNet setDelegate: self.delegate];
     [metadataNet setDepth: self.depth];
     [metadataNet setDirectory: self.directory];
-    [metadataNet setDirectoryID: self.directoryID];
-    [metadataNet setDirectoryIDTo: self.directoryIDTo];
     [metadataNet setEncryptedMetadata: self.encryptedMetadata];
     [metadataNet setEtag:self.etag];
     [metadataNet setExpirationTime: self.expirationTime];

+ 1 - 3
iOSClient/Networking/OCNetworking.m

@@ -519,9 +519,7 @@
 - (void)readFolder
 {
     [self readFolder:_metadataNet.serverUrl depth:_metadataNet.depth account:_metadataNet.account success:^(NSArray *metadatas, tableMetadata *metadataFolder, NSString *directoryID) {
-        
-        _metadataNet.directoryID = directoryID;
-        
+                
         if ([self.delegate respondsToSelector:@selector(readFolderSuccessFailure:metadataFolder:metadatas:message:errorCode:)])
             [self.delegate readFolderSuccessFailure:_metadataNet metadataFolder:metadataFolder metadatas:metadatas message:nil errorCode:0];
         

+ 0 - 1
iOSClient/Synchronize/CCSynchronize.m

@@ -68,7 +68,6 @@
     if (!directoryID) return;
     
     metadataNet.depth = @"1";
-    metadataNet.directoryID = directoryID;
     metadataNet.priority = NSOperationQueuePriorityLow;
     metadataNet.selector = selector;
     metadataNet.serverUrl = serverUrl;