Browse Source

add selector : selectorLoadCopy

Marino Faggiana 8 years ago
parent
commit
c85edc09a3
3 changed files with 25 additions and 6 deletions
  1. 1 0
      iOSClient/CCGlobal.h
  2. 1 1
      iOSClient/Create/CCCreateCloud.swift
  3. 23 5
      iOSClient/Main/CCMain.m

+ 1 - 0
iOSClient/CCGlobal.h

@@ -224,6 +224,7 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define selectorLoadModelView           @"loadModelView"
 #define selectorLoadPlist               @"loadPlist"
 #define selectorLoadViewImage           @"loadViewImage"
+#define selectorLoadCopy                @"loadCopy"
 #define selectorMove                    @"move"
 #define selectorMoveCrypto              @"moveCrypto"
 #define selectorMovePlist               @"movePlist"

+ 1 - 1
iOSClient/Create/CCCreateCloud.swift

@@ -212,7 +212,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         self.init()
         
         if titleLocalServerUrl == nil || titleLocalServerUrl?.isEmpty == true {
-            self.titleLocalServerUrl = "/" //NSLocalizedString("_root_", comment: "")
+            self.titleLocalServerUrl = "/"
         } else {
             self.titleLocalServerUrl = titleLocalServerUrl
         }

+ 23 - 5
iOSClient/Main/CCMain.m

@@ -1264,6 +1264,14 @@
         [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
     }
     
+    // Copy
+    if ([selector isEqualToString:selectorLoadCopy]) {
+        
+        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        
+        [self copyFileFiles];
+    }
+    
     // download and view a template
     if ([selector isEqualToString:selectorLoadModelView]) {
         
@@ -3697,12 +3705,18 @@
 {
     if (@selector(copyFile:) == action) {
         
-        if (_isSelectedMode == NO && _metadata) {
-            
-            if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, _metadata.fileID]]) return YES;
-            else return NO;
+        // NO Directory
+        // NO Error Passcode
+        // NO In Session mode (download/upload)
+        // NO Template
+        
+        if (_isSelectedMode == NO && _metadata && !_metadata.directory && !_metadata.errorPasscode && [_metadata.session length] == 0 && ![_metadata.typeFile isEqualToString:metadataTypeFile_template])  {
             
-        } else return NO;
+            // NO Cryptated with Title lenght = 0
+            if (!_metadata.cryptated || (_metadata.cryptated && _metadata.title.length > 0))
+                return YES;
+        }
+        return NO;
     }
     
     if (@selector(copyFiles:) == action) {
@@ -3822,6 +3836,10 @@
             
             NSDictionary *item = [NSDictionary dictionaryWithObjectsAndKeys:[NSKeyedArchiver archivedDataWithRootObject:_metadata], @"it.twsweb.Crypto-Cloud.CCMetadata", nil];
             [items addObject:item];
+            
+        } else {
+            
+            [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:_localServerUrl downloadData:YES downloadPlist:NO selector:selectorLoadCopy selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
         }
     }