From ec121f6d62faed41886eeeec534ec6f898474a04 Mon Sep 17 00:00:00 2001 From: simon-liubin Date: Tue, 2 Sep 2014 10:10:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8D=95=E8=8E=B7=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E8=B0=83=E5=88=B0onFailure=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/qiniu/io/IO.java | 20 ++++++++++++------ src/com/qiniu/resumableio/ResumableIO.java | 24 ++++++++++++++-------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/com/qiniu/io/IO.java b/src/com/qiniu/io/IO.java index 7710c1909..5d7bb1f7d 100644 --- a/src/com/qiniu/io/IO.java +++ b/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; @@ -20,12 +18,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(null, new QiniuException(QiniuException.IO, "build multipart", 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(null, new QiniuException(QiniuException.IO, "build multipart", e)); + return null; + } } public static UploadTaskExecutor put(Authorizer auth, @@ -34,7 +42,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(null, new QiniuException(QiniuException.IO, "build multipart", e)); return null; } diff --git a/src/com/qiniu/resumableio/ResumableIO.java b/src/com/qiniu/resumableio/ResumableIO.java index 6cec1ad5d..ff98e82d6 100644 --- a/src/com/qiniu/resumableio/ResumableIO.java +++ b/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; @@ -26,17 +24,27 @@ public static UploadTaskExecutor putFile(Context mContext, public static UploadTaskExecutor putFile(Context mContext, Authorizer auth, String key, Uri uri, PutExtra extra, List 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(null, new QiniuException(QiniuException.IO, "build multipart", 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 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 blocks, CallBack callback) { + try{ + return put(auth, key, InputStreamAt.fromFile(file), extra, blocks, callback); + } catch (Exception e) { + callback.onFailure(null, new QiniuException(QiniuException.IO, "build multipart", e)); + return null; + } } public static UploadTaskExecutor put(Authorizer auth, String key, @@ -51,7 +59,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(null, new QiniuException(QiniuException.IO, "build multipart", e)); return null; } From cefe127ab3e204f0fa9a5164d0f8012de2224a13 Mon Sep 17 00:00:00 2001 From: simon-liubin Date: Tue, 2 Sep 2014 10:14:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8D=95=E8=8E=B7=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E8=B0=83=E5=88=B0onFailure=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/qiniu/resumableio/ResumableIO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/qiniu/resumableio/ResumableIO.java b/src/com/qiniu/resumableio/ResumableIO.java index ff98e82d6..910b1f238 100644 --- a/src/com/qiniu/resumableio/ResumableIO.java +++ b/src/com/qiniu/resumableio/ResumableIO.java @@ -27,7 +27,7 @@ public static UploadTaskExecutor putFile(Context mContext, try { return put(auth, key, InputStreamAt.fromUri(mContext, uri), extra, blocks, callback); } catch (Exception e) { - callback.onFailure(null, new QiniuException(QiniuException.IO, "build multipart", e)); + callback.onFailure(null, new QiniuException(QiniuException.IO, "", e)); return null; } } @@ -42,7 +42,7 @@ public static UploadTaskExecutor putFile(Authorizer auth, String key, try{ return put(auth, key, InputStreamAt.fromFile(file), extra, blocks, callback); } catch (Exception e) { - callback.onFailure(null, new QiniuException(QiniuException.IO, "build multipart", e)); + callback.onFailure(null, new QiniuException(QiniuException.IO, "", e)); return null; } } @@ -60,7 +60,7 @@ public static UploadTaskExecutor put(Authorizer auth, String key, task.execute(); return new UploadTaskExecutor(task); } catch (Exception e) { - callback.onFailure(null, new QiniuException(QiniuException.IO, "build multipart", e)); + callback.onFailure(null, new QiniuException(QiniuException.IO, "", e)); return null; } }