marinofaggiana 5 anos atrás
pai
commit
2754cc2e02
1 arquivos alterados com 3 adições e 5 exclusões
  1. 3 5
      iOSClient/Main/CCMain.m

+ 3 - 5
iOSClient/Main/CCMain.m

@@ -1579,7 +1579,7 @@
 #pragma mark ===== Move / Copy =====
 #pragma mark ===== Move / Copy =====
 #pragma --------------------------------------------------------------------------------------------
 #pragma --------------------------------------------------------------------------------------------
 
 
-- (void)moveFileOrFolderMetadata:(tableMetadata *)metadata serverUrlTo:(NSString *)serverUrlTo move:(BOOL)move overwrite:(BOOL)overwrite
+- (void)moveCopyFileOrFolderMetadata:(tableMetadata *)metadata serverUrlTo:(NSString *)serverUrlTo move:(BOOL)move overwrite:(BOOL)overwrite
 {
 {
     if (_isSelectedMode && [_selectedocIdsMetadatas count] == 0)
     if (_isSelectedMode && [_selectedocIdsMetadatas count] == 0)
         return;
         return;
@@ -1633,15 +1633,13 @@
         }
         }
         
         
         BOOL move = true;
         BOOL move = true;
-        BOOL overwrite = false;
-        
         if ([buttonType isEqualToString:@"done1"]) { move = false; }
         if ([buttonType isEqualToString:@"done1"]) { move = false; }
         
         
         if ([_selectedocIdsMetadatas count] > 0) {
         if ([_selectedocIdsMetadatas count] > 0) {
             NSArray *metadatas = [_selectedocIdsMetadatas allValues];
             NSArray *metadatas = [_selectedocIdsMetadatas allValues];
-            [self moveFileOrFolderMetadata:[metadatas objectAtIndex:0] serverUrlTo:serverUrl move:move overwrite:overwrite];
+            [self moveCopyFileOrFolderMetadata:[metadatas objectAtIndex:0] serverUrlTo:serverUrl move:move overwrite:overwrite];
         } else {
         } else {
-            [self moveFileOrFolderMetadata:self.metadata serverUrlTo:serverUrl move:move overwrite:overwrite];
+            [self moveCopyFileOrFolderMetadata:self.metadata serverUrlTo:serverUrl move:move overwrite:overwrite];
         }
         }
     }
     }
 }
 }