Merge pull request #422 from YangSen-qn/develop

change get status_code logic

Author: bachue

library/src/androidTest/java/com/qiniu/android/UploadReportItemTest.java

@@ -29,7 +29,7 @@ public void testReportStatusCode(){
         assertTrue(ReportItem.requestReportStatusCode(responseInfo) != null);
 
         responseInfo = createResponseInfo(200);
-        assertTrue(ReportItem.requestReportStatusCode(responseInfo) == null);
+        assertTrue(ReportItem.requestReportStatusCode(responseInfo).equals("200"));
     }
 
     public void testReportErrorType(){

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

@@ -106,14 +106,18 @@ public String toJson(){
 
 
     public static String requestReportStatusCode(ResponseInfo responseInfo){
-        if (responseInfo.statusCode > -10 && responseInfo.statusCode < 0) {
-            return String.format("%d", responseInfo.statusCode);
-        } else {
+        if (responseInfo == null){
             return null;
+        } else {
+            return String.format("%d", responseInfo.statusCode);
         }
     }
 
     public static String requestReportErrorType(ResponseInfo responseInfo){
+        if (responseInfo == null){
+            return "unknown_error";
+        }
+
         String errorType = null;
         if (responseInfo.statusCode > 199 && responseInfo.statusCode < 300) {
 
@@ -150,6 +154,9 @@ public static String requestReportErrorType(ResponseInfo responseInfo){
     }
 
     public static String qualityResult(ResponseInfo responseInfo){
+        if (responseInfo == null){
+            return "unknown_error";
+        }
 
         String result = null;
 

library/src/main/java/com/qiniu/android/http/request/HttpSingleRequest.java

@@ -162,7 +162,7 @@ private void reportRequest(ResponseInfo responseInfo,
         item.setReport(ReportItem.LogTypeRequest, ReportItem.RequestKeyLogType);
         item.setReport((currentTimestamp/1000), ReportItem.RequestKeyUpTime);
         item.setReport(ReportItem.requestReportStatusCode(responseInfo), ReportItem.RequestKeyStatusCode);
-        item.setReport(responseInfo.reqId, ReportItem.RequestKeyRequestId);
+        item.setReport(responseInfo != null ? responseInfo.reqId : null, ReportItem.RequestKeyRequestId);
         item.setReport(requestMetricsP.request.host, ReportItem.RequestKeyHost);
         item.setReport(requestMetricsP.remoteAddress, ReportItem.RequestKeyRemoteIp);
         item.setReport(requestMetricsP.remotePort, ReportItem.RequestKeyPort);
@@ -186,7 +186,7 @@ private void reportRequest(ResponseInfo responseInfo,
         String errorType = ReportItem.requestReportErrorType(responseInfo);
         item.setReport(errorType, ReportItem.RequestKeyErrorType);
         String errorDesc = null;
-        if (errorType != null){
+        if (responseInfo != null && errorType != null){
             errorDesc = responseInfo.error != null ? responseInfo.error : responseInfo.message;
         }
         item.setReport(errorDesc, ReportItem.RequestKeyErrorDescription);