瀏覽代碼

fix async network

Marino Faggiana 7 年之前
父節點
當前提交
1cf517f8bc
共有 2 個文件被更改,包括 9 次插入7 次删除
  1. 2 0
      iOSClient/Main/CCMain.m
  2. 7 7
      iOSClient/Networking/NCNetworkingSync.m

+ 2 - 0
iOSClient/Main/CCMain.m

@@ -4047,11 +4047,13 @@
                                     handler:^(AHKActionSheet *as) {
                                         
                                         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+                                            
                                             if ([app.endToEndInterface markEndToEndFolderEncrypted:app.activeUrl fileID:_metadata.fileID serverUrl:[NSString stringWithFormat:@"%@/%@", self.serverUrl, _metadata.fileName]]) {
                                                dispatch_async(dispatch_get_main_queue(), ^{
                                                    [self readFolder:self.serverUrl];
                                                });
                                             }
+                                            
                                         });
                                     }];
         }

+ 7 - 7
iOSClient/Networking/NCNetworkingSync.m

@@ -57,7 +57,7 @@
 
     }];
      
-     while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_NOW))
+     while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER))
          [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:k_timeout_webdav]];
      
      return returnError;
@@ -83,7 +83,7 @@
         dispatch_semaphore_signal(semaphore);
     }];
     
-    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_NOW))
+    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER))
         [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:k_timeout_webdav]];
     
     return returnError;
@@ -109,7 +109,7 @@
         dispatch_semaphore_signal(semaphore);
     }];
     
-    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_NOW))
+    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER))
         [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:k_timeout_webdav]];
     
     return returnError;
@@ -141,7 +141,7 @@
         dispatch_semaphore_signal(semaphore);
     }];
     
-    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_NOW))
+    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER))
         [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:k_timeout_webdav]];
     
     *token = returnToken;
@@ -168,7 +168,7 @@
         dispatch_semaphore_signal(semaphore);
     }];
     
-    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_NOW))
+    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER))
         [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:k_timeout_webdav]];
     
     return returnError;
@@ -194,7 +194,7 @@
         dispatch_semaphore_signal(semaphore);
     }];
     
-    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_NOW))
+    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER))
         [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:k_timeout_webdav]];
     
     return returnError;
@@ -220,7 +220,7 @@
         dispatch_semaphore_signal(semaphore);
     }];
     
-    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_NOW))
+    while (dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER))
         [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:k_timeout_webdav]];
     
     return returnError;