github/cordova-plugin-file-transfer
4
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-file-transfer.git synced 2026-04-28 00:02:49 +08:00
Code Issues Projects Releases Wiki Activity

CB-8093 Fixes incorrect FileTransferError returned in case of download failure

Browse Source
This commit is contained in:
Vladimir Kotikov
2014-11-27 17:45:42 +03:00
parent 6fee835928
commit 80aa828021
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/windows/FileTransferProxy.js
+31 -25
View File
@@ -236,34 +236,40 @@ exec(win, fail, 'FileTransfer', 'upload',
successCallback && successCallback(new FileEntry(storageFile.name, storageFile.path, null, nativeURI)); successCallback && successCallback(new FileEntry(storageFile.name, storageFile.path, null, nativeURI));
}, function(error) { }, function(error) {
var result; var getTransferError = new WinJS.Promise(function (resolve) {
// Handle download error here. If download was cancelled, // Handle download error here. If download was cancelled,
// message property will be specified // message property will be specified
if (error.message == 'Canceled') { if (error.message === 'Canceled') {
result = new FileTransferError(FileTransferError.ABORT_ERR, source, target, null, null, error); resolve(new FileTransferError(FileTransferError.ABORT_ERR, source, target, null, null, error));
} else { } else {
// in the other way, try to get response property // in the other way, try to get response property
var response = download.getResponseInformation(); var response = download.getResponseInformation();
if (!response) { if (!response) {
result = new FileTransferError(FileTransferError.CONNECTION_ERR, source, target); resolve(new FileTransferError(FileTransferError.CONNECTION_ERR, source, target));
} else if (response.statusCode == 401 || response.statusCode == 404) { } else {
result = new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR, source, target, response.statusCode, null, error); var reader = new Windows.Storage.Streams.DataReader(download.getResultStreamAt(0));
reader.loadAsync(download.progress.bytesReceived).then(function (bytesLoaded) {
var payload = reader.readString(bytesLoaded);
resolve(new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR, source, target, response.statusCode, payload, error));
});
}
} }
}
// Update TransferOperation object with new state, delete promise property
// since it is not actual anymore
var currentDownloadOp = fileTransferOps[downloadId];
if (currentDownloadOp) {
currentDownloadOp.state = FileTransferOperation.CANCELLED;
currentDownloadOp.promise = null;
}
// Cleanup, remove incompleted file
storageFile.deleteAsync().then(function () {
errorCallback && errorCallback(result);
}); });
getTransferError.then(function (fileTransferError) {
// Update TransferOperation object with new state, delete promise property
// since it is not actual anymore
var currentDownloadOp = fileTransferOps[downloadId];
if (currentDownloadOp) {
currentDownloadOp.state = FileTransferOperation.CANCELLED;
currentDownloadOp.promise = null;
}
// Cleanup, remove incompleted file
storageFile.deleteAsync().then(function() {
errorCallback && errorCallback(fileTransferError);
});
});
}, function(evt) { }, function(evt) {