Skip to content

捕获异常，回调到onFailure中 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 2, 2014
Merged

捕获异常，回调到onFailure中 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec121f6
捕获异常，回调到onFailure中
sxci Sep 2, 2014
cefe127
捕获异常，回调到onFailure中
sxci Sep 2, 2014
31548e7
merge from 65
sxci Sep 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/com/qiniu/io/IO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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,
Expand All @@ -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;
}
Expand Down
24 changes: 16 additions & 8 deletions src/com/qiniu/resumableio/ResumableIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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,
Expand All @@ -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;
}
Expand Down