Merge pull request #66 from simon-liubin/update/check-ex

捕获异常，回调到onFailure中

Author: longbai

src/com/qiniu/io/IO.java

@@ -1,8 +1,6 @@
 package com.qiniu.io;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 
 import android.content.Context;
 import android.net.Uri;
@@ -21,12 +19,22 @@ public class IO {
 
 	public static UploadTaskExecutor putFile(Context mContext, 
 			Authorizer auth, String key, Uri uri, PutExtra extra, CallBack callback) {
-		return put(auth, key, InputStreamAt.fromUri(mContext, uri), extra, callback);
+		try {
+			return put(auth, key, InputStreamAt.fromUri(mContext, uri), extra, callback);
+		} catch (Exception e) {
+			callback.onFailure(new CallRet(Conf.ERROR_CODE, "", e));
+			return null;
+		}
 	}
 
 	public static UploadTaskExecutor putFile(Authorizer auth, String key, 
-			File file, PutExtra extra, CallBack callback) throws FileNotFoundException {
-		return put(auth, key, InputStreamAt.fromFile(file), extra, callback);
+			File file, PutExtra extra, CallBack callback) {
+		try {
+			return put(auth, key, InputStreamAt.fromFile(file), extra, callback);
+		} catch (Exception e) {
+			callback.onFailure(new CallRet(Conf.ERROR_CODE, "", e));
+			return null;
+		}
 	}
 
 	public static UploadTaskExecutor put(Authorizer auth, 
@@ -35,7 +43,7 @@ public static UploadTaskExecutor put(Authorizer auth,
 			SimpleUploadTask task = new SimpleUploadTask(auth, input, key, extra, callback);
 			task.execute();
 			return new UploadTaskExecutor(task);
-		} catch (IOException e) {
+		} catch (Exception e) {
 			callback.onFailure(new CallRet(Conf.ERROR_CODE, "", e));
 			return null;
 		}

src/com/qiniu/resumableio/ResumableIO.java

@@ -1,8 +1,6 @@
 package com.qiniu.resumableio;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.List;
 
 import android.content.Context;
@@ -27,17 +25,27 @@ public static UploadTaskExecutor putFile(Context mContext,
 	public static UploadTaskExecutor putFile(Context mContext, 
 			Authorizer auth, String key, Uri uri, PutExtra extra,
 			List<Block> blocks, CallBack callback) {
-		return put(auth, key, InputStreamAt.fromUri(mContext, uri), extra, blocks, callback);
+		try {
+			return put(auth, key, InputStreamAt.fromUri(mContext, uri), extra, blocks, callback);
+		} catch (Exception e) {
+			callback.onFailure(new CallRet(Conf.ERROR_CODE, "", e));
+			return null;
+		}
 	}
 
 	public static UploadTaskExecutor putFile(Authorizer auth, String key, 
-			File file, PutExtra extra, CallBack callback) throws FileNotFoundException {
+			File file, PutExtra extra, CallBack callback) {
 		return putFile(auth, key, file, extra, null, callback);
 	}
 
-	public static UploadTaskExecutor putFile(Authorizer auth, String key, File file, 
-			PutExtra extra, List<Block> blocks, CallBack callback) throws FileNotFoundException {
-		return put(auth, key, InputStreamAt.fromFile(file), extra, blocks, callback);
+	public static UploadTaskExecutor putFile(Authorizer auth, String key, 
+			File file, PutExtra extra, List<Block> blocks, CallBack callback) {
+		try{
+			return put(auth, key, InputStreamAt.fromFile(file), extra, blocks, callback);
+		} catch (Exception e) {
+			callback.onFailure(new CallRet(Conf.ERROR_CODE, "", e));
+			return null;
+		}
 	}
 
 	public static UploadTaskExecutor put(Authorizer auth, String key, 
@@ -52,7 +60,7 @@ public static UploadTaskExecutor put(Authorizer auth, String key,
 			task.setLastUploadBlocks(blocks);
 			task.execute();
 			return new UploadTaskExecutor(task);
-		} catch (IOException e) {
+		} catch (Exception e) {
 			callback.onFailure(new CallRet(Conf.ERROR_CODE, "", e));
 			return null;
 		}