Merge pull request #58 from qiniu/develop

Release 6.0.4

Author: longbai

.travis.yml

@@ -1,36 +1,18 @@
-language: java
+language: android
 jdk: oraclejdk7
 env:
   matrix:
     - ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
-before_install:
-  # Install base Android SDK
-  - chmod +x gradlew
-  - sudo apt-get update -qq
-  - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
-  - wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz
-  - tar xzf android-sdk_r22.3-linux.tgz
-  - export ANDROID_HOME=$PWD/android-sdk-linux
-  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 
-  # Install required components.
-  # For a full list, run `android list sdk -a --extended`
-  # Note that sysimg-19 downloads only ARM, because only the first license query is accepted.
-  - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
-  - echo yes | android update sdk --all --filter build-tools-19.0.0 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter sysimg-19 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
+android:
+  components:
+    - build-tools-19.0.3
 
-  # Create and start emulator
+before_install:
   - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
   - emulator -avd test -no-skin -no-audio -no-window &
-
 before_script:
-  - adb wait-for-device
+  - ./ci/wait_for_emulator.sh
   - adb shell input keyevent 82 &
 
-script:
-  #- ./gradlew build
-  - ./gradlew connectedInstrumentTest
+script: ./gradlew connectedInstrumentTest

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## CHANGE LOG
 
+### v6.0.4
+2014-07-20 issue [#58](https://github.com/qiniu/android-sdk/pull/58)
+
+- [#50] 统一UA
+- [#53] 使用自定义的QiniuException
+- [#56] [#57] 多host上传重试
 
 ### v6.0.3
 2014-07-11 issue [#49](https://github.com/qiniu/android-sdk/pull/49)

build.gradle

@@ -12,7 +12,7 @@ apply plugin: 'android'
 
 android {
   compileSdkVersion 19
-  buildToolsVersion '19'
+  buildToolsVersion '19.0.3'
 
   sourceSets {
     main {
@@ -39,4 +39,4 @@ android {
     compile fileTree(dir: 'libs', include: '*.jar')
   }
 }
-// if don't find sdk, please set the local.properties
+// if don't find sdk, please set the local.properties

ci/wait_for_emulator.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+bootanim=""
+failcounter=0
+until [[ "$bootanim" =~ "stopped" ]]; do
+   bootanim=`adb -e shell getprop init.svc.bootanim 2>&1`
+   echo "$bootanim"
+   if [[ "$bootanim" =~ "not found" ]]; then
+      let "failcounter += 1"
+      if [[ $failcounter -gt 3 ]]; then
+        echo "Failed to start emulator"
+        exit 1
+      fi
+   fi
+   sleep 1
+done
+echo "Done"

src/com/qiniu/auth/CallRet.java

@@ -1,11 +1,12 @@
 package com.qiniu.auth;
 
 import com.qiniu.utils.IOnProcess;
+import com.qiniu.utils.QiniuException;
 
 public abstract class CallRet implements IOnProcess {
 	public void onInit(int flag){}
 	public abstract void onSuccess(byte[] body);
-	public abstract void onFailure(Exception ex);
+	public abstract void onFailure(QiniuException ex);
 	public void onProcess(long current, long total){}
 	public void onPause(Object tag){}
 }

src/com/qiniu/auth/Client.java

@@ -1,8 +1,7 @@
 package com.qiniu.auth;
 
 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;
@@ -24,6 +23,11 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
+
+import com.qiniu.conf.Conf;
+import com.qiniu.utils.ICancel;
+import com.qiniu.utils.QiniuException;
+
 public class Client {
 
 	protected HttpClient mClient;
@@ -44,10 +48,8 @@ public static ClientExecutor get(String url, CallRet 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();
-		}
+		String contentType = header == null ? "application/octet-stream" :  header.getValue();
+
 		return call(client, url, contentType, entity, ret);
 	}
 
@@ -76,7 +78,7 @@ protected ClientExecutor execute(ClientExecutor client, HttpRequestBase httpRequ
 	}
 
 	protected HttpResponse roundtrip(HttpRequestBase httpRequest) throws IOException {
-		httpRequest.setHeader("User-Agent", Conf.USER_AGENT);
+		httpRequest.setHeader("User-Agent", Conf.getUserAgent());
 		return mClient.execute(httpRequest);
 	}
 
@@ -91,33 +93,49 @@ public void setup(HttpRequestBase httpRequest, CallRet ret) {
 		public void upload(long current, long total) {
 			publishProgress(current, total);
 		}
-		
+
 		@Override
 		protected Object doInBackground(Object... objects) {
 			try {
 				HttpResponse resp = roundtrip(mHttpRequest);
 				int statusCode = resp.getStatusLine().getStatusCode();
-				String xl = resp.getFirstHeader("X-Log").getValue();
+				String phrase = resp.getStatusLine().getReasonPhrase();
+
+				Header h = resp.getFirstHeader("X-Log");
+				String xl = h == null ? "":h.getValue();
+
+				h = resp.getFirstHeader("X-Reqid");
+				String reqId = h == null ? "":h.getValue();
 
-				if (statusCode == 401) return new Exception("unauthorized!"); // android 2.3 will not response
-				if (xl.contains("invalid BlockCtx")) return new Exception(xl);
+				if (statusCode == 401) {
+					return new QiniuException(401, reqId, phrase); // android 2.3 will not response
+				}
 
 				byte[] data = EntityUtils.toByteArray(resp.getEntity());
-				if (statusCode / 100 == 2) return data;
-				if (data.length > 0) return new Exception(new String(data));
-				if (xl.length() > 0) return new Exception(xl);
-				return new Exception(resp.getStatusLine().getStatusCode() + ":" + resp.getStatusLine().getReasonPhrase());
+				if (statusCode / 100 == 2) {
+					return data;
+				}
+
+				if (data.length > 0) {
+					return new QiniuException(statusCode, reqId, new String(data));
+				}
+				if (xl.length() > 0) {
+					return new QiniuException(statusCode, reqId, xl);
+				}
+				return new QiniuException(statusCode, reqId, phrase);
 			} catch (IOException e) {
 				e.printStackTrace();
-				return e;
+				return new QiniuException(QiniuException.IO, "net IOException", e);
 			}
 		}
 
 		@Override
 		protected void onProgressUpdate(Object... values) {
-			if (failed) return;
-			if (values.length == 1 && values[0] instanceof Exception) {
-				mRet.onFailure((Exception) values[0]);
+			if (failed){
+				return;
+			}
+			if (values.length == 1 && values[0] instanceof QiniuException) {
+				mRet.onFailure((QiniuException) values[0]);
 				failed = true;
 				return;
 			}
@@ -126,15 +144,17 @@ protected void onProgressUpdate(Object... values) {
 
 		@Override
 		protected void onPostExecute(Object o) {
-			if (failed) return;
-			if (o instanceof Exception) {
-				mRet.onFailure((Exception) o);
+			if (failed) {
+				return;
+			}
+			if (o instanceof QiniuException) {
+				mRet.onFailure((QiniuException) o);
 				return;
 			}
 			mRet.onSuccess((byte[]) o);
 		}
 
-		public void onFailure(Exception ex) {
+		public void onFailure(QiniuException ex) {
 			publishProgress(ex);
 			cancel(true);
 		}

src/com/qiniu/auth/JSONObjectRet.java

@@ -3,6 +3,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import com.qiniu.utils.QiniuException;
+
 public abstract class JSONObjectRet extends CallRet {
 	public JSONObjectRet(){}
 	protected int mIdx;
@@ -17,7 +19,7 @@ public void onSuccess(byte[] body) {
 			onSuccess(obj);
 		} catch (JSONException e) {
 			e.printStackTrace();
-			onFailure(new Exception(new String(body)));
+			onFailure(new QiniuException(QiniuException.JSON, new String(body), e));
 		}
 	}
 

src/com/qiniu/conf/Conf.java

@@ -1,6 +1,11 @@
 package com.qiniu.conf;
 
 public class Conf {
-	public static final String USER_AGENT = "qiniu android-sdk v6.0.0";
-	public static final String UP_HOST = "http://upload.qiniu.com";
+    public static final String VERSION = "6.0.4";
+    public static String UP_HOST = "http://upload.qiniu.com";
+    public static String UP_HOST2 = "http://up.qiniu.com";
+
+    public static String getUserAgent() {
+        return  "QiniuAndroid/" + VERSION + " (" + android.os.Build.VERSION.RELEASE + "; " + android.os.Build.MODEL+ ")";
+    }
 }

src/com/qiniu/demo/MyActivity.java

@@ -7,13 +7,16 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
+
+import org.json.JSONObject;
+
+import java.util.HashMap;
+
 import com.qiniu.R;
 import com.qiniu.auth.JSONObjectRet;
 import com.qiniu.io.IO;
 import com.qiniu.io.PutExtra;
-import org.json.JSONObject;
-
-import java.util.HashMap;
+import com.qiniu.utils.QiniuException;
 
 public class MyActivity extends Activity implements View.OnClickListener{
 
@@ -84,7 +87,7 @@ public void onSuccess(JSONObject resp) {
 			}
 
 			@Override
-			public void onFailure(Exception ex) {
+			public void onFailure(QiniuException ex) {
 				uploading = false;
 				hint.setText("错误: " + ex.getMessage());
 			}

src/com/qiniu/demo/MyResumableActivity.java

@@ -9,15 +9,17 @@
 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;
 
+import com.qiniu.R;
+import com.qiniu.auth.JSONObjectRet;
+import com.qiniu.resumableio.PutExtra;
+import com.qiniu.resumableio.ResumableIO;
+import com.qiniu.utils.QiniuException;
+
 public class MyResumableActivity extends Activity implements View.OnClickListener {
 	private ProgressBar pb;
 	private Button start;
@@ -95,7 +97,7 @@ public void onPause(Object tag) {
 			}
 
 			@Override
-			public void onFailure(Exception ex) {
+			public void onFailure(QiniuException ex) {
 				hint.setText(ex.getMessage());
 			}
 		});