Merge pull request #40 from longbai/url_conv

ui callback

Author: longbai

QiniuSDK/Common/QNAsyncRun.h

@@ -9,3 +9,5 @@
 typedef void (^QNRun)(void);
 
 void QNAsyncRun(QNRun run);
+
+void QNAsyncRunInMain(QNRun run);

QiniuSDK/Common/QNAsyncRun.m

@@ -14,3 +14,9 @@ void QNAsyncRun(QNRun run) {
 		run();
 	});
 }
+
+void QNAsyncRunInMain(QNRun run) {
+	dispatch_async(dispatch_get_main_queue(), ^(void) {
+		run();
+	});
+}

QiniuSDK/Storage/QNUploadManager.m

@@ -116,7 +116,7 @@ + (BOOL)checkAndNotifyError:(NSString *)key
 		desc = @"no token";
 	}
 	if (desc != nil) {
-		QNAsyncRun( ^{
+		QNAsyncRunInMain( ^{
 			completionHandler([QNResponseInfo responseInfoWithInvalidArgument:desc], key, nil);
 		});
 		return YES;
@@ -132,11 +132,18 @@ - (void)putData:(NSData *)data
 	if ([QNUploadManager checkAndNotifyError:key token:token data:data file:nil complete:completionHandler]) {
 		return;
 	}
+
+	QNUpCompletionHandler complete = ^(QNResponseInfo *info, NSString *key, NSDictionary *resp)
+	{
+		QNAsyncRunInMain( ^{
+			completionHandler(info, key, resp);
+		});
+	};
 	QNFormUpload *up = [[QNFormUpload alloc]
 	                    initWithData:data
 	                              withKey:key
 	                            withToken:token
-	                withCompletionHandler:completionHandler
+	                withCompletionHandler:complete
 	                           withOption:option
 	                      withHttpManager:_httpManager
 	                    withConfiguration:_config];
@@ -159,7 +166,7 @@ - (void)putFile:(NSString *)filePath
 		NSDictionary *fileAttr = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:&error];
 
 		if (error) {
-			QNAsyncRun( ^{
+			QNAsyncRunInMain( ^{
 				QNResponseInfo *info = [QNResponseInfo responseInfoWithFileError:error];
 				completionHandler(info, key, nil);
 			});
@@ -170,7 +177,7 @@ - (void)putFile:(NSString *)filePath
 		UInt32 fileSize = [fileSizeNumber intValue];
 		NSData *data = [NSData dataWithContentsOfFile:filePath options:NSDataReadingMappedIfSafe error:&error];
 		if (error) {
-			QNAsyncRun( ^{
+			QNAsyncRunInMain( ^{
 				QNResponseInfo *info = [QNResponseInfo responseInfoWithFileError:error];
 				completionHandler(info, key, nil);
 			});
@@ -183,7 +190,9 @@ - (void)putFile:(NSString *)filePath
 
 		QNUpCompletionHandler complete = ^(QNResponseInfo *info, NSString *key, NSDictionary *resp)
 		{
-			completionHandler(info, key, resp);
+			QNAsyncRunInMain( ^{
+				completionHandler(info, key, resp);
+			});
 		};
 
 		NSDate *modifyTime = fileAttr[NSFileModificationDate];