Merge pull request #382 from JemyCheung/error_type

Error type

Author: bachue

library/src/main/java/com/qiniu/android/collect/UploadInfoElement.java

@@ -508,14 +508,18 @@ public long getUp_time() {
     }
 
 
-    public static String resultCode(int statuscode) {
+    public static String resultCode(int statuscode, String error) {
         String result = "";
         switch (statuscode) {
             case 200:
                 result = "ok";
                 break;
             case ResponseInfo.NetworkError:
-                result = "network_error";
+                if (error != null && error.indexOf("but received") != -1) {
+                    result = "file_changed";
+                } else {
+                    result = "network_error";
+                }
                 break;
             case ResponseInfo.Cancelled:
                 result = "user_canceled";
@@ -554,14 +558,18 @@ public static String resultCode(int statuscode) {
         return result;
     }
 
-    public static String errorType(int statuscode) {
+    public static String errorType(int statuscode, String error) {
         String result = "";
         if (200 < statuscode && statuscode < 600) {
             return "response_error";
         }
         switch (statuscode) {
             case ResponseInfo.NetworkError:
-                result = "network_error";
+                if (error != null && error.indexOf("but received") != -1) {
+                    result = "file_changed";
+                } else {
+                    result = "network_error";
+                }
                 break;
             case ResponseInfo.Cancelled:
                 result = "user_canceled";

library/src/main/java/com/qiniu/android/http/ResponseInfo.java

@@ -166,7 +166,7 @@ public String toRecordMsg() {
                                 logHandler.send("prefetched_ip_count", (long) resolveResults.size());
                             }
                             if (error != null) {
-                                logHandler.send("error_type", UploadInfoElement.errorType(statusCode));
+                                logHandler.send("error_type", UploadInfoElement.errorType(statusCode, error));
                                 logHandler.send("error_description", error);
                             }
 

library/src/main/java/com/qiniu/android/storage/ResumeUploader.java

@@ -144,7 +144,7 @@ private void makeBlock(String upHost, long offset, int blockSize, int chunkSize,
         logHandler.send("up_type", "mkblk");
         logHandler.send("tid", (long) android.os.Process.myTid());
         logHandler.send("file_offset", offset);
-        logHandler.send("bytes_total", chunkSize);
+        logHandler.send("bytes_total", (long) chunkSize);
         String path = format(Locale.ENGLISH, "/mkblk/%d", blockSize);
         try {
             file.seek(offset);
@@ -165,7 +165,7 @@ private void putChunk(String upHost, long offset, int chunkSize, String context,
         logHandler.send("up_type", "bput");
         logHandler.send("tid", (long) android.os.Process.myTid());
         logHandler.send("file_offset", offset);
-        logHandler.send("bytes_total", chunkSize);
+        logHandler.send("bytes_total", (long) chunkSize);
         int chunkOffset = (int) (offset % Configuration.BLOCK_SIZE);
         String path = format(Locale.ENGLISH, "/bput/%s/%d", context, chunkOffset);
         try {
@@ -209,7 +209,7 @@ private void makeFile(String upHost, CompletionHandler _completionHandler, UpCan
         byte[] data = bodyStr.getBytes();
         String postUrl = String.format("%s%s", upHost, path);
         logHandler.send("file_offset", 0);
-        logHandler.send("bytes_total", data.length);
+        logHandler.send("bytes_total", (long) data.length);
         post(logHandler, postUrl, data, 0, data.length, null, _completionHandler, c);
     }
 

library/src/main/java/com/qiniu/android/storage/ResumeUploaderFast.java

@@ -320,7 +320,7 @@ private void makeFile(String upHost, CompletionHandler _completionHandler, UpCan
         String bodyStr = StringUtils.join(contexts, ",");
         byte[] data = bodyStr.getBytes();
         String postUrl = String.format("%s%s", upHost, path);
-        logHandler.send("bytes_total", data.length);
+        logHandler.send("bytes_total", (long) data.length);
         post(logHandler, postUrl, data, 0, data.length, null, _completionHandler, c);
     }
 

library/src/main/java/com/qiniu/android/storage/UploadManager.java

@@ -343,7 +343,7 @@ public void complete(final String key, final ResponseInfo res, final JSONObject
                             @Override
                             public String toRecordMsg() {
                                 LogHandler logHandler = UploadInfoElementCollector.getUplogHandler(UploadInfo.getUploadQuality());
-                                logHandler.send("result", UploadInfoElement.resultCode(res.statusCode));
+                                logHandler.send("result", UploadInfoElement.resultCode(res.statusCode, res.error));
                                 logHandler.send("total_elapsed_time", after - before);
                                 logHandler.send("requests_counts", res.requests_count);
                                 logHandler.send("bytes_sent", res.bytes_sent);