Marino Faggiana před 8 roky
rodič
revize
d8a31f8a08

+ 6 - 4
iOSClient/Actions/CCActions.swift

@@ -56,7 +56,6 @@ class CCActions: NSObject {
     //MARK: Local Variable
     
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
-    var metadataNet: CCMetadataNet = CCMetadataNet.init()
     
     //MARK: Init
     
@@ -70,8 +69,8 @@ class CCActions: NSObject {
     func deleteFileOrFolder(_ metadata: CCMetadata, delegate: AnyObject) {
         
         let serverUrl = CCCoreData.getServerUrl(fromDirectoryID: metadata.directoryID, activeAccount: appDelegate.activeAccount)!
-        let metadataNet = CCMetadataNet.init()
-        
+        let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
+
         if metadata.cryptated == true {
             
             metadataNet.action = actionDeleteFileDirectory
@@ -137,7 +136,7 @@ class CCActions: NSObject {
     func renameFileOrFolder(_ metadata: CCMetadata, fileName: String, delegate: AnyObject) {
 
         let crypto = CCCrypto.init()
-        let metadataNet = CCMetadataNet.init()
+        let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
         
         let fileName = CCUtility.removeForbiddenCharacters(fileName, hasServerForbiddenCharactersSupport: appDelegate.hasServerForbiddenCharactersSupport)!
         
@@ -292,7 +291,10 @@ class CCActions: NSObject {
         
         if (serverUrl != nil) {
             
+            let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
+
             metadataNet.action = actionReadFolder;
+            metadataNet.directoryID = CCCoreData.getDirectoryID(fromServerUrl: serverUrl, activeAccount: appDelegate.activeUser)
             metadataNet.delegate = delegate
             metadataNet.fileName = fileName
             metadataNet.selector = selectorSearch

+ 3 - 2
iOSClient/Main/CCMain.m

@@ -4068,6 +4068,7 @@
 - (void)tableView:(UITableView *)tableView swipeAccessoryButtonPushedForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     _metadata = [self getMetadataFromSectionDataSource:indexPath];
+    
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:_metadata.directoryID activeAccount:_metadata.account];
     
     NSString *titoloCriptaDecripta, *titoloOffline, *titoloLock, *titleOfflineFolder;
@@ -4540,9 +4541,9 @@
 
 - (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    _metadata = [self getMetadataFromSectionDataSource:indexPath];
+    CCMetadata *metadata = [self getMetadataFromSectionDataSource:indexPath];
     
-    if (_metadata.errorPasscode || (_metadata.cryptated && [_metadata.title length] == 0) || _metadata.sessionTaskIdentifier >= 0 || _metadata.sessionTaskIdentifier >= 0) return UITableViewCellEditingStyleNone;
+    if (metadata.errorPasscode || (metadata.cryptated && [metadata.title length] == 0) || metadata.sessionTaskIdentifier >= 0 || metadata.sessionTaskIdentifier >= 0) return UITableViewCellEditingStyleNone;
     else return UITableViewCellEditingStyleDelete;
 }
 

+ 2 - 0
iOSClient/Utility/CCUtility.m

@@ -788,6 +788,8 @@
     metadata.protocol = @"";
     metadata.rev = itemDto.etag;
     metadata.size = itemDto.size;
+    metadata.sessionTaskIdentifier = taskIdentifierDone;
+    metadata.sessionTaskIdentifierPlist = taskIdentifierDone;
     metadata.title = @"";
     metadata.type = metadataType_file;
     metadata.typeFile = @"";