Skip to content

Commit c8349f4

Browse files
hashir review
1 parent 62c95ff commit c8349f4

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

src/android/FileTransferBackground.java

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -411,31 +411,28 @@ private void acknowledgeEvent(String eventId, CallbackContext context) {
411411
*/
412412
private void handleAck(final Data ackData) {
413413
if (!ackData.getBoolean(UploadTask.KEY_OUTPUT_IS_ERROR, false)) {
414-
sendError(
415-
ackData.getString(UploadTask.KEY_OUTPUT_ID),
416-
ackData.getString(UploadTask.KEY_OUTPUT_FAILURE_REASON),
417-
ackData.getBoolean(UploadTask.KEY_OUTPUT_FAILURE_CANCELED, false)
418-
);
419-
} else {
420414
String response = null;
421415
if (ackData.getString(UploadTask.KEY_OUTPUT_RESPONSE_FILE) != null) {
422416
response = readFileToStringNoThrow(ackData.getString(UploadTask.KEY_OUTPUT_RESPONSE_FILE));
423417
}
424418

425-
long startUploadTime = ackData.getLong("output_upload_start_time", 0);
426-
long finishUploadTime = ackData.getLong("output_upload_finish_time", 0);
419+
long startUploadTime = ackData.getLong(UploadTask.KEY_OUTPUT_UPLOAD_START_TIME, 0);
420+
long finishUploadTime = ackData.getLong(UploadTask.KEY_OUTPUT_UPLOAD_FINISH_TIME, 0);
427421
long uploadDuration = finishUploadTime - startUploadTime;
428422

429423
HashMap<String, Object> uploadData = new HashMap<>();
430424
uploadData.put("outputId", ackData.getString(UploadTask.KEY_OUTPUT_ID));
431425
uploadData.put("response", response);
432426
uploadData.put("statusCode", ackData.getInt(UploadTask.KEY_OUTPUT_STATUS_CODE, -1));
433-
434-
if (uploadDuration > 0) {
435-
uploadData.put("uploadDuration", uploadDuration);
436-
uploadData.put("finishUploadTime", finishUploadTime);
437-
}
427+
uploadData.put("uploadDuration", uploadDuration);
428+
uploadData.put("finishUploadTime", finishUploadTime);
438429
sendSuccess(uploadData);
430+
} else {
431+
sendError(
432+
ackData.getString(UploadTask.KEY_OUTPUT_ID),
433+
ackData.getString(UploadTask.KEY_OUTPUT_FAILURE_REASON),
434+
ackData.getBoolean(UploadTask.KEY_OUTPUT_FAILURE_CANCELED, false)
435+
);
439436
}
440437
}
441438

0 commit comments

Comments
 (0)