Browse Source

No change user if I/O in action

Marino Faggiana 8 years ago
parent
commit
0d41d66c60

+ 4 - 1
iOSClient/Main/CCMain.m

@@ -3181,8 +3181,11 @@
     if (app.reSelectMenu.isOpen || app.reMainMenu.isOpen)
         return;
     
-    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [app.netQueueUploadCameraAllPhoto operationCount] > 0)
+    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [app.netQueueUploadCameraAllPhoto operationCount] > 0) {
+        
+        [app messageNotification:@"_transfer_in_queue_" description:nil visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
         return;
+    }
     
     NSArray *listTableAccount = [CCCoreData getAllTableAccount];
     NSMutableArray *menuArray = [[NSMutableArray alloc] init];

+ 9 - 0
iOSClient/Settings/CCManageAccount.m

@@ -326,8 +326,17 @@
 
 - (void)ChangeDefaultAccount:(NSString *)account
 {
+    if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [app.netQueueUploadCameraAllPhoto operationCount] > 0) {
+        
+        [app messageNotification:@"_transfer_in_queue_" description:nil visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+        [self UpdateForm];
+        return;
+    }
+
+    // removed  this -> ?????
     [app cancelAllOperations];
     [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
+    // removed  this -> ?????
     
     // change account
     TableAccount *tableAccount = [CCCoreData setActiveAccount:account];

+ 6 - 2
iOSClient/Synchronization/CCSynchronization.m

@@ -222,12 +222,15 @@
 - (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID account:(NSString *)account synchronization:(BOOL)synchronization
 {
     NSMutableArray *metadatas = [[NSMutableArray alloc] init];
-    TableAccount *recordAccount = [CCCoreData getActiveAccount];
     
     for (CCMetadata *metadata in allRecordMetadatas) {
         
         BOOL changeRev = NO;
         
+        // change account
+        if ([metadata.account isEqualToString:account] == NO)
+            return;
+        
         // no dir
         if (metadata.directory)
             continue;
@@ -245,7 +248,7 @@
                 changeRev = YES;
         }
         
-        if (changeRev && [recordAccount.account isEqualToString:account]) {
+        if (changeRev) {
             
             if ([metadata.type isEqualToString:metadataType_file]) {
                 
@@ -261,6 +264,7 @@
             }
             
             [metadatas addObject:metadata];
+            
         }
     }