diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 54c214f0c..212678a98 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5,6 +5,7 @@
android:versionName="1.0">
+
+
+
+
diff --git a/docs/README.md b/docs/README.md
index cfc11aed5..74d515a7b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,6 +2,9 @@
title: Android SDK 使用指南
---
+- Android SDK 下载地址：
+- Android SDK 源码地址： (请注意非 master 分支的代码在规格上可能承受变更)
+
此 Android SDK 基于 [七牛云存储官方API](http://docs.qiniu.com/api/index.html) 构建。在开发者的 Android App 工程项目中使用此 SDK 能够非常方便地将 Android 系统里边的文件快速直传到七牛云存储。
出于安全考虑，使用此 SDK 无需设置密钥（AccessKey / SecretKey）。所有涉及到授权的操作，比如生成上传授权凭证（uploadToken）或下载授权凭证（downloadToken）均在业务服务器端进行。
diff --git a/res/layout/main.xml b/res/layout/main.xml
index a1d7c5285..2daa79f41 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -27,5 +27,11 @@
android:id="@+id/textView1"
android:layout_marginBottom="20dp"
android:layout_centerHorizontal="true" android:layout_above="@+id/button1"/>
+
diff --git a/res/layout/resumable.xml b/res/layout/resumable.xml
new file mode 100644
index 000000000..f60ea3fde
--- /dev/null
+++ b/res/layout/resumable.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5df244b39..2d9875256 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,4 +1,5 @@
android-sdk
+ android-sdk-resumable
diff --git a/src/com/qiniu/auth/CallRet.java b/src/com/qiniu/auth/CallRet.java
index b2a061e0c..3238920bb 100644
--- a/src/com/qiniu/auth/CallRet.java
+++ b/src/com/qiniu/auth/CallRet.java
@@ -1,7 +1,11 @@
package com.qiniu.auth;
-public abstract class CallRet {
+import com.qiniu.utils.IOnProcess;
+
+public abstract class CallRet implements IOnProcess {
+ public void onInit(int flag){}
public abstract void onSuccess(byte[] body);
public abstract void onFailure(Exception ex);
- public void onSuccess(){}
-}
\ No newline at end of file
+ public void onProcess(long current, long total){}
+ public void onPause(Object tag){}
+}
diff --git a/src/com/qiniu/auth/Client.java b/src/com/qiniu/auth/Client.java
index 330399e3a..03917eada 100644
--- a/src/com/qiniu/auth/Client.java
+++ b/src/com/qiniu/auth/Client.java
@@ -2,10 +2,15 @@
import android.os.AsyncTask;
import com.qiniu.conf.Conf;
+import com.qiniu.utils.ICancel;
+import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.scheme.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme;
@@ -19,86 +24,106 @@
import java.io.IOException;
public class Client {
-
+
protected HttpClient mClient;
-
+
public Client(HttpClient client) {
mClient = client;
}
- public void call(String url, CallRet ret) {
- HttpPost httppost = new HttpPost(url);
- execute(httppost, ret);
+ public static ClientExecutor get(String url, CallRet ret) {
+ Client client = Client.defaultClient();
+ return client.get(client.makeClientExecutor(), url, ret);
}
- public void call(String url, HttpEntity entity, CallRet ret) {
- call(url, entity.getContentType().getValue(), entity, ret);
+ public ClientExecutor call(ClientExecutor client, String url, HttpEntity entity, CallRet ret) {
+ Header header = entity.getContentType();
+ String contentType = "application/octet-stream";
+ if (header != null) {
+ contentType = header.getValue();
+ }
+ return call(client, url, contentType, entity, ret);
}
- public void call(String url, String contentType, HttpEntity entity, CallRet ret) {
+ public ClientExecutor call(ClientExecutor client, String url, String contentType, HttpEntity entity, CallRet ret) {
HttpPost httppost = new HttpPost(url);
httppost.setEntity(entity);
if (contentType != null) {
httppost.setHeader("Content-Type", contentType);
}
- execute(httppost, ret);
+ return execute(client, httppost, ret);
+ }
+
+ public ClientExecutor get(ClientExecutor client, String url, CallRet ret) {
+ return execute(client, new HttpGet(url), ret);
}
- protected void execute(HttpPost httpPost, CallRet ret) {
- new ClientExecuter().execute(httpPost, ret);
+ public ClientExecutor makeClientExecutor() {
+ return new ClientExecutor();
}
- protected HttpResponse roundtrip(HttpPost httpPost) throws IOException {
- httpPost.setHeader("User-Agent", Conf.USER_AGENT);
- return mClient.execute(httpPost);
+ protected ClientExecutor execute(ClientExecutor client, HttpRequestBase httpRequest, final CallRet ret) {
+ client.setup(httpRequest, ret);
+ client.execute();
+ return client;
+ }
+
+ protected HttpResponse roundtrip(HttpRequestBase httpRequest) throws IOException {
+ httpRequest.setHeader("User-Agent", Conf.USER_AGENT);
+ return mClient.execute(httpRequest);
}
- class ClientExecuter extends AsyncTask {
- HttpPost httpPost;
- CallRet ret;
+ public class ClientExecutor extends AsyncTask implements ICancel {
+ HttpRequestBase mHttpRequest;
+ CallRet mRet;
+ public void setup(HttpRequestBase httpRequest, CallRet ret) {
+ mHttpRequest = httpRequest;
+ mRet = ret;
+ }
+ public void upload(long current, long total) {
+ publishProgress(current, total);
+ }
@Override
protected Object doInBackground(Object... objects) {
- httpPost = (HttpPost) objects[0];
- ret = (CallRet) objects[1];
- String errMsg = "";
-
- HttpResponse resp;
try {
- resp = roundtrip(httpPost);
+ HttpResponse resp = roundtrip(mHttpRequest);
+ int statusCode = resp.getStatusLine().getStatusCode();
+ if (statusCode == 401) { // android 2.3 will not response
+ return new Exception("unauthorized!");
+ }
+ byte[] data = EntityUtils.toByteArray(resp.getEntity());
+
+ if (statusCode / 100 != 2) {
+ if (data.length == 0) {
+ String xlog = resp.getFirstHeader("X-Log").getValue();
+ if (xlog.length() > 0) {
+ return new Exception(xlog);
+ }
+ return new Exception(resp.getStatusLine().getReasonPhrase());
+ }
+ return new Exception(new String(data));
+ }
+ return data;
} catch (IOException e) {
e.printStackTrace();
return e;
}
+ }
- if (resp.getHeaders("X-Log").length > 0) {
- errMsg = resp.getHeaders("X-Log")[0].getValue();
- }
-
- int statusCode = resp.getStatusLine().getStatusCode();
-
- if (statusCode / 100 != 2) {
- return new Exception(errMsg);
- }
-
- byte[] data = new byte[0];
- try {
- data = EntityUtils.toByteArray(resp.getEntity());
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return data;
+ @Override
+ protected void onProgressUpdate(Object... values) {
+ mRet.onProcess((Long) values[0], (Long) values[1]);
}
@Override
protected void onPostExecute(Object o) {
if (o instanceof Exception) {
- ret.onFailure((Exception) o);
+ mRet.onFailure((Exception) o);
return;
}
- ret.onSuccess((byte[]) o);
+ mRet.onSuccess((byte[]) o);
}
};
@@ -107,11 +132,10 @@ public static Client defaultClient() {
}
public static HttpClient getMultithreadClient() {
- HttpParams params = new BasicHttpParams();
- SchemeRegistry registry = new SchemeRegistry();
- registry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
- ClientConnectionManager cm = new ThreadSafeClientConnManager(params, registry);
- HttpClient client = new DefaultHttpClient(cm, params);
+ HttpClient client = new DefaultHttpClient();
+ ClientConnectionManager mgr = client.getConnectionManager();
+ HttpParams params = client.getParams();
+ client = new DefaultHttpClient(new ThreadSafeClientConnManager(params, mgr.getSchemeRegistry()), params);
return client;
}
}
diff --git a/src/com/qiniu/auth/JSONObjectRet.java b/src/com/qiniu/auth/JSONObjectRet.java
index e511f13e7..47fad134e 100644
--- a/src/com/qiniu/auth/JSONObjectRet.java
+++ b/src/com/qiniu/auth/JSONObjectRet.java
@@ -4,6 +4,9 @@
import org.json.JSONObject;
public abstract class JSONObjectRet extends CallRet {
+ public JSONObjectRet(){}
+ protected int mIdx;
+ public JSONObjectRet(int idx) { mIdx = idx; }
@Override
public void onSuccess(byte[] body) {
if (body == null) {
@@ -13,6 +16,7 @@ public void onSuccess(byte[] body) {
JSONObject obj = new JSONObject(new String(body));
onSuccess(obj);
} catch (JSONException e) {
+ e.printStackTrace();
onFailure(new Exception(new String(body)));
}
}
diff --git a/src/com/qiniu/auth/UpClient.java b/src/com/qiniu/auth/UpClient.java
deleted file mode 100644
index 7105d283d..000000000
--- a/src/com/qiniu/auth/UpClient.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.qiniu.auth;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-
-import java.io.IOException;
-
-public class UpClient extends Client {
- private String mUpToken;
-
- public UpClient(HttpClient client) {
- super(client);
- }
-
- public void updateToken(String token) {
- mUpToken = token;
- }
-
- @Override
- protected HttpResponse roundtrip(HttpPost httpPost) throws IOException {
- if (mUpToken != null) {
- httpPost.setHeader("Authorization", "UpToken " + mUpToken);
- }
- return super.roundtrip(httpPost);
- }
-
- public static UpClient defaultClient() {
- return new UpClient(getMultithreadClient());
- }
-
-}
diff --git a/src/com/qiniu/demo/MyActivity.java b/src/com/qiniu/demo/MyActivity.java
index 392c14648..2dcdddd04 100644
--- a/src/com/qiniu/demo/MyActivity.java
+++ b/src/com/qiniu/demo/MyActivity.java
@@ -13,26 +13,28 @@
import com.qiniu.io.PutExtra;
import org.json.JSONObject;
+import java.util.HashMap;
+
public class MyActivity extends Activity implements View.OnClickListener{
public static final int PICK_PICTURE_RESUMABLE = 0;
// @gist upload_arg
// 在七牛绑定的对应bucket的域名. 默认是bucket.qiniudn.com
- public static String bucketName = "bucketName";
+ public static String bucketName = "";
public static String domain = bucketName + ".qiniudn.com";
// upToken 这里需要自行获取. SDK 将不实现获取过程. 当token过期后才再获取一遍
- public String UP_TOKEN = "token";
+ public String uptoken = "";
// @endgist
private Button btnUpload;
+ private Button btnResumableUpload;
private TextView hint;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
-
initWidget();
}
@@ -41,10 +43,10 @@ public void onCreate(Bundle savedInstanceState) {
*/
private void initWidget() {
hint = (TextView) findViewById(R.id.textView1);
-
btnUpload = (Button) findViewById(R.id.button1);
btnUpload.setOnClickListener(this);
-
+ btnResumableUpload = (Button) findViewById(R.id.button);
+ btnResumableUpload.setOnClickListener(this);
}
// @gist upload
@@ -61,22 +63,20 @@ private void doUpload(Uri uri) {
uploading = true;
String key = IO.UNDEFINED_KEY; // 自动生成key
PutExtra extra = new PutExtra();
- extra.checkCrc = PutExtra.AUTO_CRC32;
- extra.params.put("x:arg", "value");
+ extra.params = new HashMap();
+ extra.params.put("x:a", "测试中文信息");
hint.setText("上传中");
- IO.putFile(this, UP_TOKEN, key, uri, extra, new JSONObjectRet() {
+ IO.putFile(this, uptoken, key, uri, extra, new JSONObjectRet() {
+ @Override
+ public void onProcess(long current, long total) {
+ hint.setText(current + "/" + total);
+ }
+
@Override
public void onSuccess(JSONObject resp) {
uploading = false;
- String hash;
- String value;
- try {
- hash = resp.getString("hash");
- value = resp.getString("x:arg");
- } catch (Exception ex) {
- hint.setText(ex.getMessage());
- return;
- }
+ String hash = resp.optString("hash", "");
+ String value = resp.optString("x:a", "");
String redirect = "http://" + domain + "/" + hash;
hint.setText("上传成功! " + hash);
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(redirect));
@@ -99,12 +99,15 @@ public void onClick(View view) {
startActivityForResult(i, PICK_PICTURE_RESUMABLE);
return;
}
+ if (view.equals(btnResumableUpload)) {
+ startActivity(new Intent(this, MyResumableActivity.class));
+ return;
+ }
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode != RESULT_OK) return;
-
if (requestCode == PICK_PICTURE_RESUMABLE) {
doUpload(data.getData());
return;
diff --git a/src/com/qiniu/demo/MyResumableActivity.java b/src/com/qiniu/demo/MyResumableActivity.java
new file mode 100644
index 000000000..25cd90a59
--- /dev/null
+++ b/src/com/qiniu/demo/MyResumableActivity.java
@@ -0,0 +1,136 @@
+package com.qiniu.demo;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+import com.qiniu.R;
+import com.qiniu.auth.JSONObjectRet;
+import com.qiniu.resumableio.PutExtra;
+import com.qiniu.resumableio.ResumableIO;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+
+public class MyResumableActivity extends Activity implements View.OnClickListener {
+ private ProgressBar pb;
+ private Button start;
+ private Button stop;
+ private TextView hint;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.resumable);
+ initWidget();
+ }
+
+ public void initWidget() {
+ pb = (ProgressBar) findViewById(R.id.progressBar);
+ pb.setMax(100);
+ hint = (TextView) findViewById(R.id.textView2);
+ start = (Button) findViewById(R.id.button1);
+ start.setOnClickListener(this);
+ stop = (Button) findViewById(R.id.button2);
+ stop.setOnClickListener(this);
+ }
+
+
+ @Override
+ public void onClick(View view) {
+ if (view.equals(start)) {
+ selectFile();
+ return;
+ }
+ if (view.equals(stop)) {
+ if (uploadUri == null) {
+ Toast.makeText(this, "还没开始任务", 20).show();
+ return;
+ }
+ if (taskId >= 0) {
+ ResumableIO.stop(taskId);
+ stop.setText("开始");
+ hint.setText("暂停");
+ taskId = -1;
+ return;
+ }
+ stop.setText("暂停");
+ hint.setText("连接中");
+ doResumableUpload(uploadUri, mExtra);
+ return;
+ }
+ }
+ int taskId = -1;
+ Uri uploadUri;
+ PutExtra mExtra;
+
+ public void doResumableUpload(final Uri uri, PutExtra extra) {
+ hint.setText("连接中");
+ String key = null;
+ String token = "";
+ extra.params = new HashMap();
+ extra.params.put("x:a", "bb");
+ taskId = ResumableIO.putFile(this, token, key, uri, extra, new JSONObjectRet() {
+ @Override
+ public void onSuccess(JSONObject obj) {
+ hint.setText("上传成功: " + obj.optString("key", ""));
+ }
+
+ @Override
+ public void onProcess(long current, long total) {
+ float percent = (float) (current*10000/total) / 100;
+ hint.setText("上传中: " + percent + "%");
+ pb.setProgress((int) percent);
+ }
+
+ @Override
+ public void onPause(Object tag) {
+ uploadUri = uri;
+ mExtra = (PutExtra) tag;
+ }
+
+ @Override
+ public void onFailure(Exception ex) {
+ hint.setText(ex.getMessage());
+ }
+ });
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (resultCode != RESULT_OK) return;
+ PutExtra e = new PutExtra();
+ e.notify = new PutExtra.INotify() {
+ @Override
+ public void onSuccessUpload(PutExtra ex) {
+ if (ex.isFinishAll()) return;
+ JSONObject json;
+ try {
+ json = ex.toJSON();
+ } catch (JSONException e1) {
+ e1.printStackTrace();
+ return;
+ }
+ // store to disk
+ // restore PutExtra by new PutExtra(JSONObject);
+ }
+ };
+ doResumableUpload(data.getData(), e);
+ }
+
+ public void selectFile() {
+ Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+ intent.setType("*/*");
+ intent.addCategory(Intent.CATEGORY_OPENABLE);
+ try {
+ startActivityForResult(Intent.createChooser(intent, "请选择一个要上传的文件"), 1);
+ } catch (android.content.ActivityNotFoundException ex) {
+ ex.printStackTrace();
+ }
+ }
+}
diff --git a/src/com/qiniu/io/IO.java b/src/com/qiniu/io/IO.java
index a7e89b169..134fe694c 100644
--- a/src/com/qiniu/io/IO.java
+++ b/src/com/qiniu/io/IO.java
@@ -1,25 +1,29 @@
package com.qiniu.io;
import android.content.Context;
+import android.database.Cursor;
import android.net.Uri;
import com.qiniu.auth.Client;
import com.qiniu.auth.JSONObjectRet;
import com.qiniu.conf.Conf;
+import com.qiniu.utils.IOnProcess;
import com.qiniu.utils.InputStreamAt;
import com.qiniu.utils.MultipartEntity;
import org.json.JSONObject;
-import java.io.FileNotFoundException;
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.Map;
public class IO {
- public static String UNDEFINED_KEY = "?";
-
+ public static String UNDEFINED_KEY = null;
private static Client mClient;
-
- public static void setClient(Client client) {
+ private static String mUptoken;
+ public IO(Client client, String uptoken) {
mClient = client;
+ mUptoken = uptoken;
}
private static Client defaultClient() {
@@ -32,77 +36,107 @@ private static Client defaultClient() {
/**
* 上传二进制
*
- * @param uptoken 用于上传的验证信息
- * @param key 键值名, UNDEFINED_KEY 表示自动生成key
- * @param isa 二进制数据
+ * @param key 键值名, UNDEFINED_KEY 表示自动生成key
+ * @param isa 二进制数据
* @param extra 上传参数
- * @param ret 回调函数
+ * @param ret 回调函数
*/
- public static void put(String uptoken, String key, InputStreamAt isa, PutExtra extra, JSONObjectRet ret) {
-
+ public void put(String key, InputStreamAt isa, PutExtra extra, JSONObjectRet ret) {
MultipartEntity m = new MultipartEntity();
- if (key == null) {
- key = UNDEFINED_KEY;
- }
- if ( ! key.equals(UNDEFINED_KEY)) {
- m.addField("key", key);
- }
-
- if (uptoken == null || uptoken.length() == 0) {
- ret.onFailure(new Exception("uptoken未提供"));
- return;
- }
-
- if (extra.checkCrc == PutExtra.AUTO_CRC32) {
- extra.crc32 = isa.crc32();
- }
- if (extra.checkCrc != PutExtra.UNUSE_CRC32) {
- m.addField("crc32", extra.crc32 + "");
- }
-
- for (Map.Entry i: extra.params.entrySet()) {
- m.addField(i.getKey(), i.getValue());
- }
+ if (key != null) m.addField("key", key);
+ if (extra.checkCrc == PutExtra.AUTO_CRC32) extra.crc32 = isa.crc32();
+ if (extra.checkCrc != PutExtra.UNUSE_CRC32) m.addField("crc32", extra.crc32 + "");
+ for (Map.Entry i: extra.params.entrySet()) m.addField(i.getKey(), i.getValue());
- m.addField("token", uptoken);
- m.addFile("file", extra.mimeType, key, isa);
+ m.addField("token", mUptoken);
+ m.addFile("file", extra.mimeType, key == null ? "?" : key, isa);
-
- defaultClient().call(Conf.UP_HOST, m, ret);
+ Client client = defaultClient();
+ final Client.ClientExecutor executor = client.makeClientExecutor();
+ m.setProcessNotify(new IOnProcess() {
+ @Override
+ public void onProcess(long current, long total) {
+ executor.upload(current, total);
+ }
+ });
+ client.call(executor, Conf.UP_HOST, m, ret);
}
/**
* 通过提供URI来上传指定的文件
*
* @param mContext
- * @param uptoken 用于上传的验证信息
* @param key
* @param uri 通过图库或其他拿到的URI
* @param extra 上传参数
* @param ret 结果回调函数
*/
- public static void putFile(Context mContext, String uptoken, String key, Uri uri, PutExtra extra, final JSONObjectRet ret) {
-
- final InputStreamAt isa;
+ public void putFile(Context mContext, String key, Uri uri, PutExtra extra, final JSONObjectRet ret) {
+ if (!uri.toString().startsWith("file")) uri = convertFileUri(mContext, uri);
try {
- isa = InputStreamAt.fromInputStream(mContext, mContext.getContentResolver().openInputStream(uri));
- } catch (FileNotFoundException e) {
+ File file = new File(new URI(uri.toString()));
+ if (file.exists()) {
+ putAndClose(key, InputStreamAt.fromFile(file), extra, ret);
+ return;
+ }
+ ret.onFailure(new Exception("file not exist: " + uri.toString()));
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
ret.onFailure(e);
- return;
}
-
- put(uptoken, key, isa, extra, new JSONObjectRet() {
+ }
+ public void putFile(String key, File file, PutExtra extra, JSONObjectRet callback) {
+ putAndClose(key, InputStreamAt.fromFile(file), extra, callback);
+ }
+
+ public void putAndClose(final String key, final InputStreamAt input, final PutExtra extra, final JSONObjectRet ret) {
+ put(key, input, extra, new JSONObjectRet() {
@Override
public void onSuccess(JSONObject obj) {
- isa.close();
+ input.close();
ret.onSuccess(obj);
}
-
+
+ @Override
+ public void onProcess(long current, long total) {
+ ret.onProcess(current, total);
+ }
+
+ @Override
+ public void onPause(Object tag) {
+ ret.onPause(tag);
+ }
+
@Override
public void onFailure(Exception ex) {
- isa.close();
+ input.close();
ret.onFailure(ex);
}
});
}
+
+ public static Uri convertFileUri(Context mContext, Uri uri) {
+ String filePath;
+ if (uri != null && "content".equals(uri.getScheme())) {
+ Cursor cursor = mContext.getContentResolver().query(uri, new String[] { android.provider.MediaStore.Images.ImageColumns.DATA }, null, null, null);
+ cursor.moveToFirst();
+ filePath = cursor.getString(0);
+ cursor.close();
+ } else {
+ filePath = uri.getPath();
+ }
+ return Uri.parse("file://" + filePath);
+ }
+
+ public static void put(String uptoken, String key, InputStreamAt input, PutExtra extra, JSONObjectRet callback) {
+ new IO(defaultClient(), uptoken).put(key, input, extra, callback);
+ }
+
+ public static void putFile(Context mContext, String uptoken, String key, Uri uri, PutExtra extra, JSONObjectRet callback) {
+ new IO(defaultClient(), uptoken).putFile(mContext, key, uri, extra, callback);
+ }
+ public static void putFile(String uptoken, String key, File file, PutExtra extra, JSONObjectRet callback) {
+ new IO(defaultClient(), uptoken).putFile(key, file, extra, callback);
+ }
}
+
diff --git a/src/com/qiniu/resumableio/PutExtra.java b/src/com/qiniu/resumableio/PutExtra.java
new file mode 100644
index 000000000..67b38acb4
--- /dev/null
+++ b/src/com/qiniu/resumableio/PutExtra.java
@@ -0,0 +1,58 @@
+package com.qiniu.resumableio;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+public class PutExtra {
+ public Map params;
+ public PutRet[] processes;
+ public String mimeType;
+ public INotify notify;
+
+ long totalSize;
+
+ public PutExtra() {}
+ public PutExtra(JSONObject obj) {
+ mimeType = obj.optString("mimeType", "");
+ JSONArray procs = obj.optJSONArray("processes");
+ processes = new PutRet[procs.length()];
+ for (int i=0; i();
+ JSONObject paramsJson = obj.optJSONObject("params");
+ for (Iterator iter = paramsJson.keys(); iter.hasNext();) {
+ String key = (String) iter.next();
+ params.put(key, paramsJson.optString(key));
+ }
+ }
+
+ public boolean isFinishAll() {
+ if (totalSize <= 0) return false;
+ long currentSize = 0;
+ for (PutRet pr: processes) {
+ currentSize += pr.offset;
+ }
+ return currentSize >= totalSize;
+ }
+
+ public JSONObject toJSON() throws JSONException {
+ JSONObject json = new JSONObject();
+ JSONArray process = new JSONArray();
+ for (PutRet p: processes) {
+ process.put(p.toJSON());
+ }
+ json.put("processes", process);
+ json.put("mimeType", mimeType);
+ if (params != null) json.put("params", new JSONObject(params));
+ return json;
+ }
+ public interface INotify {
+ public void onSuccessUpload(PutExtra ex);
+ }
+}
diff --git a/src/com/qiniu/resumableio/PutRet.java b/src/com/qiniu/resumableio/PutRet.java
new file mode 100644
index 000000000..1ef66318a
--- /dev/null
+++ b/src/com/qiniu/resumableio/PutRet.java
@@ -0,0 +1,34 @@
+package com.qiniu.resumableio;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class PutRet {
+ public String ctx;
+ public String host;
+ public long crc32;
+ public String checksum;
+ public int offset = 0;
+ public boolean isInvalid() {
+ return ctx == null || offset == 0;
+ }
+ public PutRet(){}
+ public PutRet(JSONObject obj) {parse(obj);}
+ public PutRet parse(JSONObject obj) {
+ ctx = obj.optString("ctx", "");
+ host = obj.optString("host", "");
+ crc32 = Long.valueOf(obj.optString("crc32", "0"));
+ checksum = obj.optString("checksum", "");
+ offset = obj.optInt("offset", 0);
+ return this;
+ }
+ public JSONObject toJSON() throws JSONException {
+ JSONObject json = new JSONObject();
+ json.put("crc32", crc32);
+ json.put("checksum", checksum);
+ json.put("offset", offset);
+ json.put("host", host);
+ json.put("ctx", ctx);
+ return json;
+ }
+}
diff --git a/src/com/qiniu/resumableio/ResumableClient.java b/src/com/qiniu/resumableio/ResumableClient.java
new file mode 100644
index 000000000..20cad3c77
--- /dev/null
+++ b/src/com/qiniu/resumableio/ResumableClient.java
@@ -0,0 +1,131 @@
+package com.qiniu.resumableio;
+
+import android.util.Base64;
+import com.qiniu.auth.CallRet;
+import com.qiniu.auth.Client;
+import com.qiniu.auth.JSONObjectRet;
+import com.qiniu.conf.Conf;
+import com.qiniu.utils.ICancel;
+import com.qiniu.utils.InputStreamAt;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.entity.StringEntity;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+
+public class ResumableClient extends Client {
+ String mUpToken;
+ int CHUNK_SIZE = 256 * 1024;
+ int BLOCK_SIZE = 4 * 1024 * 1024;
+ public ResumableClient(HttpClient client, String uptoken) {
+ super(client);
+ mUpToken = uptoken;
+ }
+
+ @Override
+ protected HttpResponse roundtrip(HttpRequestBase httpRequest) throws IOException {
+ if (mUpToken != null) {
+ httpRequest.setHeader("Authorization", "UpToken " + mUpToken);
+ }
+ return super.roundtrip(httpRequest);
+ }
+
+ public ICancel[] putblock(final InputStreamAt input, final PutExtra extra, final PutRet putRet, final long offset, final JSONObjectRet callback) {
+ final int writeNeed = (int) Math.min(input.length()-offset, BLOCK_SIZE);
+ final ICancel[] canceler = new ICancel[] {null};
+ JSONObjectRet ret = new JSONObjectRet() {
+ long crc32, wrote, writing = 0;
+ public void onInit(int flag) {
+ flag = putRet.isInvalid() ? 0 : 1;
+ if (flag == 0) putInit();
+ if (flag == 1) putNext();
+ }
+
+ public void putInit() {
+ int chunkSize = Math.min(writeNeed, CHUNK_SIZE);
+ crc32 = input.getCrc32(offset, chunkSize);
+ canceler[0] = mkblk(input, offset, writeNeed, chunkSize, this);
+ }
+
+ public void putNext() {
+ wrote = putRet.offset;
+ int remainLength = Math.min((int) (input.length() - offset - putRet.offset), CHUNK_SIZE);
+ crc32 = input.getCrc32(offset+putRet.offset, remainLength);
+ canceler[0] = bput(putRet.host, input, putRet.ctx, offset, putRet.offset, remainLength, this);
+ }
+
+ @Override
+ public void onSuccess(JSONObject obj) {
+ if (crc32 != new PutRet(obj).crc32) {
+ onInit(-1);
+ return;
+ }
+ putRet.parse(obj);
+ if (extra.notify != null) extra.notify.onSuccessUpload(extra);
+ wrote += writing;
+ if (putRet.offset == writeNeed) {
+ callback.onSuccess(obj);
+ return;
+ }
+ putNext();
+ }
+
+ @Override
+ public void onProcess(long current, long total) {
+ writing = current;
+ callback.onProcess(wrote+writing, writeNeed);
+ }
+
+ @Override
+ public void onFailure(Exception ex) {
+ callback.onFailure(ex);
+ }
+ };
+ ret.onInit(-1);
+ return canceler;
+ }
+
+ public ICancel mkblk(InputStreamAt input, long offset, int blockSize, int writeSize, CallRet ret) {
+ String url = Conf.UP_HOST + "/mkblk/" + blockSize;
+ ClientExecutor client = makeClientExecutor();
+ call(client, url, input.toHttpEntity(offset, writeSize, client), ret);
+ return client;
+ }
+
+ public ICancel bput(String host, InputStreamAt input, String ctx, long blockOffset, long offset, int writeLength, CallRet ret) {
+ String url = host + "/bput/" + ctx + "/" + offset;
+ ClientExecutor client = makeClientExecutor();
+ call(client, url, input.toHttpEntity(blockOffset+offset, writeLength, client), ret);
+ return client;
+ }
+
+ public ICancel mkfile(String key, long fsize, String mimeType, Map params, String ctxs, CallRet ret) {
+ String url = Conf.UP_HOST + "/mkfile/" + fsize;
+ if (mimeType != null && mimeType.length() > 0) {
+ url += "/mimeType/" + encode(mimeType);
+ }
+ if (key != null && key.length() > 0) {
+ url += "/key/" + encode(key);
+ }
+ if (params != null && params.size() > 0) {
+ for (Map.Entry a: params.entrySet()) {
+ url += "/" + a.getKey() + "/" + encode(a.getValue());
+ }
+ }
+ try {
+ return call(makeClientExecutor(), url, new StringEntity(ctxs), ret);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ ret.onFailure(e);
+ return null;
+ }
+ }
+
+ public String encode(String data) {
+ return Base64.encodeToString(data.getBytes(), Base64.URL_SAFE | Base64.NO_WRAP);
+ }
+}
diff --git a/src/com/qiniu/resumableio/ResumableIO.java b/src/com/qiniu/resumableio/ResumableIO.java
new file mode 100644
index 000000000..67ca5eec8
--- /dev/null
+++ b/src/com/qiniu/resumableio/ResumableIO.java
@@ -0,0 +1,195 @@
+package com.qiniu.resumableio;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import com.qiniu.auth.Client;
+import com.qiniu.auth.JSONObjectRet;
+import com.qiniu.utils.ICancel;
+import com.qiniu.utils.InputStreamAt;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+
+public class ResumableIO {
+ ResumableClient mClient;
+ private int BLOCK_SIZE = 4 * 1024 * 1024;
+ private static int atomicId = 0;
+ static HashMap idCancels = new HashMap();
+
+ public ResumableIO(String uptoken) {
+ mClient = new ResumableClient(Client.getMultithreadClient(), uptoken);
+ }
+ public ResumableIO(ResumableClient client) {
+ mClient = client;
+ }
+
+ private synchronized Integer newTask(ICancel c) {
+ idCancels.put(atomicId, c);
+ return atomicId++;
+ }
+
+ private synchronized void removeTask(Integer id) {
+ idCancels.remove(id);
+ }
+
+ public int putAndClose(final String key, final InputStreamAt input, final PutExtra extra, final JSONObjectRet ret) {
+ return put(key, input, extra, new JSONObjectRet() {
+ @Override
+ public void onSuccess(JSONObject obj) {
+ input.close();
+ ret.onSuccess(obj);
+ }
+
+ @Override
+ public void onProcess(long current, long total) {
+ ret.onProcess(current, total);
+ }
+
+ @Override
+ public void onPause(Object tag) {
+ ret.onPause(tag);
+ }
+
+ @Override
+ public void onFailure(Exception ex) {
+ input.close();
+ ret.onFailure(ex);
+ }
+ });
+ }
+
+ public int put(final String key, final InputStreamAt input, final PutExtra extra, final JSONObjectRet ret) {
+ final int blkCount = (int) (input.length() / BLOCK_SIZE) + 1;
+ if (extra.processes == null) extra.processes = new PutRet[blkCount];
+ extra.totalSize = input.length();
+ final int[] success = new int[] {0};
+ final long[] uploaded = new long[blkCount];
+ final ICancel[][] cancelers = new ICancel[blkCount][1];
+ final boolean[] failure = new boolean[] {false};
+ final int taskId = newTask(new ICancel() {
+
+ @Override
+ public boolean cancel(boolean isIntercupt) {
+ for (ICancel[] cancel: cancelers) {
+ if (cancel == null || cancel[0] == null) continue;
+ cancel[0].cancel(true);
+ }
+ failure[0] = true;
+ ret.onPause(extra);
+ return false;
+ }
+ });
+ for (int i=0; i 0) ctx = ctx.substring(1);
+ removeTask(taskId);
+ mClient.mkfile(key, input.length(), extra.mimeType, extra.params, ctx, ret);
+ }
+
+ @Override
+ public void onSuccess(JSONObject obj) {
+ if (failure[0] || ++success[0] != blkCount) return;
+ onAllSuccess();
+ }
+
+ @Override
+ public void onProcess(long current, long total) {
+ if (failure[0]) return;
+ uploaded[mIdx] = current;
+ current = 0;
+ for (long c: uploaded) current += c;
+ ret.onProcess(current, input.length());
+ }
+
+ @Override
+ public void onFailure(Exception ex) {
+ if (--retryTime <= 0 || (ex.getMessage() != null && ex.getMessage().contains("Unauthorized"))) {
+ removeTask(taskId);
+ failure[0] = true;
+ ret.onFailure(ex);
+ return;
+ }
+ if (ex.getMessage() != null && ex.getMessage().contains("invalid BlockCtx")) {
+ uploaded[mIdx] = 0;
+ extra.processes[mIdx] = new PutRet();
+ }
+ cancelers[mIdx] = mClient.putblock(input, extra, extra.processes[mIdx], startPos, this);
+ }
+ });
+ }
+
+ return taskId;
+ }
+
+ public int putFile(String key, File file, PutExtra extra, final JSONObjectRet ret) {
+ return putAndClose(key, InputStreamAt.fromFile(file), extra, ret);
+ }
+
+ public int putFile(Context mContext, String key, Uri uri, PutExtra extra, final JSONObjectRet ret) {
+ if (!uri.toString().startsWith("file")) uri = convertFileUri(mContext, uri);
+ try {
+ File file = new File(new URI(uri.toString()));
+ if (file.exists()) return putAndClose(key, InputStreamAt.fromFile(file), extra, ret);
+ ret.onFailure(new Exception("file not exist: " + uri.toString()));
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ ret.onFailure(e);
+ }
+ return -1;
+ }
+
+ public static Uri convertFileUri(Context mContext, Uri uri) {
+ String filePath;
+ if (uri != null && "content".equals(uri.getScheme())) {
+ Cursor cursor = mContext.getContentResolver().query(uri, new String[] { android.provider.MediaStore.Images.ImageColumns.DATA }, null, null, null);
+ cursor.moveToFirst();
+ filePath = cursor.getString(0);
+ cursor.close();
+ } else {
+ filePath = uri.getPath();
+ }
+ return Uri.parse("file://" + filePath);
+ }
+
+ public synchronized static void stop(int id) {
+ ICancel c = idCancels.get(id);
+ if (c == null) return;
+ c.cancel(true);
+ idCancels.remove(id);
+ }
+
+ public static ResumableIO defaultInstance(String uptoken) {
+ return new ResumableIO(new ResumableClient(Client.getMultithreadClient(), uptoken));
+ }
+
+ public static int putAndClose(String uptoken, String key, InputStreamAt isa, PutExtra extra, JSONObjectRet ret) {
+ return ResumableIO.defaultInstance(uptoken).putAndClose(uptoken, key, isa, extra, ret);
+ }
+
+ public static int put(String uptoken, String key, InputStreamAt isa, PutExtra extra, JSONObjectRet ret) {
+ return ResumableIO.defaultInstance(uptoken).put(key, isa, extra, ret);
+ }
+
+ public static int putFile(Context mContext, String uptoken, String key, Uri uri, PutExtra extra, JSONObjectRet ret) {
+ return ResumableIO.defaultInstance(uptoken).putFile(mContext, key, uri, extra, ret);
+ }
+
+}
diff --git a/src/com/qiniu/utils/ICancel.java b/src/com/qiniu/utils/ICancel.java
new file mode 100644
index 000000000..96e979ae2
--- /dev/null
+++ b/src/com/qiniu/utils/ICancel.java
@@ -0,0 +1,5 @@
+package com.qiniu.utils;
+
+public interface ICancel {
+ public boolean cancel(boolean isIntercupt);
+}
diff --git a/src/com/qiniu/utils/IOnProcess.java b/src/com/qiniu/utils/IOnProcess.java
new file mode 100644
index 000000000..9d45a08f2
--- /dev/null
+++ b/src/com/qiniu/utils/IOnProcess.java
@@ -0,0 +1,5 @@
+package com.qiniu.utils;
+
+public interface IOnProcess {
+ public void onProcess(long current, long total);
+}
diff --git a/src/com/qiniu/utils/InputStreamAt.java b/src/com/qiniu/utils/InputStreamAt.java
index 36c5d5fad..ddac6314c 100644
--- a/src/com/qiniu/utils/InputStreamAt.java
+++ b/src/com/qiniu/utils/InputStreamAt.java
@@ -1,18 +1,24 @@
package com.qiniu.utils;
import android.content.Context;
+import android.os.Environment;
+import com.qiniu.auth.Client;
+import org.apache.http.HttpEntity;
+import org.apache.http.entity.AbstractHttpEntity;
import java.io.*;
import java.util.Arrays;
import java.util.zip.CRC32;
-public class InputStreamAt implements Closeable{
+public class InputStreamAt implements Closeable {
private RandomAccessFile mFileStream;
private byte[] mData;
private File mTmpFile;
private boolean mClosed;
+ private boolean mDelWhenClose = false;
private long mCrc32 = -1;
+ private long mLength = -1;
/**
* @param context
@@ -20,7 +26,13 @@ public class InputStreamAt implements Closeable{
*/
public static InputStreamAt fromInputStream(Context context, InputStream is) {
File file = storeToFile(context, is);
- InputStreamAt isa = new InputStreamAt(file);
+ if (file == null) return null;
+ InputStreamAt isa = new InputStreamAt(file, true);
+ return isa;
+ }
+
+ public static InputStreamAt fromFile(File f) {
+ InputStreamAt isa = new InputStreamAt(f);
return isa;
}
@@ -29,7 +41,12 @@ public static InputStreamAt fromString(String str) {
}
public InputStreamAt(File file) {
+ this(file, false);
+ }
+
+ public InputStreamAt(File file, boolean delWhenClose) {
mTmpFile = file;
+ mDelWhenClose = delWhenClose;
try {
mFileStream = new RandomAccessFile(mTmpFile, "r");
} catch (FileNotFoundException e) {
@@ -41,6 +58,13 @@ public InputStreamAt(byte[] data) {
mData = data;
}
+ public long getCrc32(long offset, int length) {
+ CRC32 crc32 = new CRC32();
+ byte[] data = read(offset, length);
+ crc32.update(data);
+ return crc32.getValue();
+ }
+
public long crc32() {
if (mCrc32 >= 0) return mCrc32;
CRC32 crc32 = new CRC32();
@@ -60,13 +84,16 @@ public long crc32() {
}
public long length() {
+ if (mLength >= 0) return mLength;
if (mData != null) {
- return mData.length;
+ mLength = mData.length;
+ return mLength;
}
if (mFileStream != null) {
try {
- return mFileStream.length();
+ mLength = mFileStream.length();
+ return mLength;
} catch (IOException e) {
e.printStackTrace();
}
@@ -75,35 +102,22 @@ public long length() {
}
protected static File storeToFile(Context context, InputStream is) {
- File outputDir = context.getCacheDir(); // context being the Activity pointer
- File f = null;
- OutputStream os = null;
try {
- f = File.createTempFile("qiniu-", "", outputDir);
- os = new FileOutputStream(f);
- byte[] buffer = new byte[4096];
+ File outputDir = getSDPath(context);
+ File f = File.createTempFile("qiniu-", "", outputDir);
+ OutputStream os = new FileOutputStream(f);
+ byte[] buffer = new byte[64 * 1024];
int bytesRead;
while ((bytesRead = is.read(buffer)) != -1) {
os.write(buffer, 0, bytesRead);
}
+ if (os != null) os.close();
+ if (is != null) is.close();
+ return f;
} catch (IOException e) {
e.printStackTrace();
+ return null;
}
- if (os != null) {
- try {
- os.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- if (is != null) {
- try {
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- return f;
}
public byte[] read(long offset, int length) {
@@ -158,7 +172,7 @@ public synchronized void close(){
}
}
- if (mTmpFile != null) {
+ if (mTmpFile != null && mDelWhenClose) {
mTmpFile.delete();
}
}
@@ -167,4 +181,60 @@ public int read(byte[] data) throws IOException {
return mFileStream.read(data);
}
+ public HttpEntity toHttpEntity(final long offset, final int length, final Client.ClientExecutor client) {
+ final InputStreamAt input = this;
+ return new AbstractHttpEntity() {
+ @Override
+ public boolean isRepeatable() {
+ return false;
+ }
+
+ @Override
+ public long getContentLength() {
+ return length;
+ }
+
+ @Override
+ public InputStream getContent() throws IOException, IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public void writeTo(OutputStream outputStream) throws IOException {
+ int blockSize = 64 * 1024;
+ long start = offset;
+ long initStart = 0;
+ long end = offset + length;
+ long total = end - start;
+ while (start < end) {
+ if (mClosed) {
+ outputStream.close();
+ return;
+ }
+ int readLength = (int) StrictMath.min((long) blockSize, end-start);
+ byte[] data = input.read(start, readLength);
+ outputStream.write(data);
+ outputStream.flush();
+ initStart += readLength;
+ client.upload(initStart, total);
+ start += readLength;
+ }
+ }
+
+ @Override
+ public boolean isStreaming() {
+ return false;
+ }
+ };
+ }
+
+ public static File getSDPath(Context context){
+ File sdDir = context.getCacheDir();
+ boolean sdCardExist = Environment.getExternalStorageState()
+ .equals(android.os.Environment.MEDIA_MOUNTED);
+ if (sdCardExist) {
+ sdDir = Environment.getExternalStorageDirectory();
+ }
+ return sdDir;
+ }
}
diff --git a/src/com/qiniu/utils/MultipartEntity.java b/src/com/qiniu/utils/MultipartEntity.java
index bf2e06ae6..93beb1eb6 100644
--- a/src/com/qiniu/utils/MultipartEntity.java
+++ b/src/com/qiniu/utils/MultipartEntity.java
@@ -11,6 +11,9 @@
public class MultipartEntity extends AbstractHttpEntity {
private String mBoundary;
+ private long mContentLength = -1;
+ private long writed = 0;
+ private IOnProcess mNotify;
private StringBuffer mData = new StringBuffer();
private ArrayList mFiles = new ArrayList();
@@ -35,11 +38,13 @@ public boolean isRepeatable() {
@Override
public long getContentLength() {
- long len = mData.length();
+ if (mContentLength > 0) return mContentLength;
+ long len = mData.toString().getBytes().length;
for (FileInfo fi: mFiles) {
len += fi.length();
}
len += 6 + mBoundary.length();
+ mContentLength = len;
return len;
}
@@ -52,11 +57,16 @@ public InputStream getContent() throws IOException, IllegalStateException {
public void writeTo(OutputStream outputStream) throws IOException {
outputStream.write(mData.toString().getBytes());
outputStream.flush();
+ writed += mData.toString().getBytes().length;
+ if (mNotify != null) mNotify.onProcess(writed, getContentLength());
for (FileInfo i: mFiles) {
i.writeTo(outputStream);
}
- outputStream.write(("--" + mBoundary + "--\r\n").getBytes());
+ byte[] data = ("--" + mBoundary + "--\r\n").getBytes();
+ outputStream.write(data);
outputStream.flush();
+ writed += data.length;
+ if (mNotify != null) mNotify.onProcess(writed, getContentLength());
outputStream.close();
}
@@ -67,11 +77,15 @@ public boolean isStreaming() {
private String fileTpl = "--%s\r\nContent-Disposition: form-data;name=\"%s\";filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
+ public void setProcessNotify(IOnProcess ret) {
+ mNotify = ret;
+ }
+
class FileInfo {
- public String mField;
- public String mContentType;
- public String mFilename;
+ public String mField = "";
+ public String mContentType = "";
+ public String mFilename = "";
public InputStreamAt mIsa;
public FileInfo(String field, String contentType, String filename, InputStreamAt isa) {
@@ -90,10 +104,15 @@ public long length() {
}
public void writeTo(OutputStream outputStream) throws IOException {
- outputStream.write(String.format(fileTpl, mBoundary, mField, mFilename, mContentType).getBytes());
+ byte[] data = String.format(fileTpl, mBoundary, mField, mFilename, mContentType).getBytes();
+ outputStream.write(data);
outputStream.flush();
+ writed += data.length;
+ if (mNotify != null) mNotify.onProcess(writed, getContentLength());
- int blockSize = 256 * 1024;
+ int blockSize = (int) (getContentLength() / 100);
+ if (blockSize > 256 * 1024) blockSize = 256 * 1024;
+ if (blockSize < 16 * 1024) blockSize = 16 * 1024;
long index = 0;
long length = mIsa.length();
while (index < length) {
@@ -101,9 +120,13 @@ public void writeTo(OutputStream outputStream) throws IOException {
outputStream.write(mIsa.read(index, readLength));
index += blockSize;
outputStream.flush();
+ writed += readLength;
+ if (mNotify != null) mNotify.onProcess(writed, getContentLength());
}
outputStream.write("\r\n".getBytes());
outputStream.flush();
+ writed += 2;
+ if (mNotify != null) mNotify.onProcess(writed, getContentLength());
}
}