Added progress callback for uploadFile #466
Conversation
This commits adds onProgress callback for uploadFile method. Useful when uploading larger files
| @@ -60,6 +65,23 @@ protected void sendBody(HttpRequest request) throws Exception { | |||
|
|
|||
| request.part(uploadName, fileName, mimeType, inputStream); | |||
| } | |||
|
|
|||
| if (hasProgressHandler) { | |||
| request.progress((transferred, total) -> { | |||
There was a problem hiding this comment.
Please don't use Java 8 features (lambda expression in this case), because this will break support for old Cordova projects still configured to run with Java 7.
There was a problem hiding this comment.
I've removed the lambda, please check if it's ok now
|
Thank you for providing this feature PR, but please do not use Java 8 features as we are still supporting old Cordova projects running on Java 7. |
|
Hi, lambda has been removed |
silkimen
force-pushed
the
master
branch
7 times, most recently
from
449aa28
to
6fc8a7e
Compare
| @@ -180,7 +180,14 @@ module.exports = function init(exec, cookieHandler, urlUtil, helpers, globalConf | |||
| break; | |||
| case 'upload': | |||
| var fileOptions = helpers.checkUploadFileOptions(options.filePath, options.name); | |||
| exec(onSuccess, onFail, 'CordovaHttpPlugin', 'uploadFiles', [url, headers, fileOptions.filePaths, fileOptions.names, options.connectTimeout, options.readTimeout, options.followRedirect, options.responseType, reqId]); | |||
| var hasProgressCallback = options.onProgress != null; | |||
There was a problem hiding this comment.
You need to check for falsey value here not for null, because it will be undefined if not provided.
| var hasProgressCallback = options.onProgress != null; | |
| var hasProgressCallback = !!options.onProgress; |
| if (resp != null && resp.isProgress) { | ||
| options.onProgress(resp); | ||
| } else { | ||
| onSuccess(resp); | ||
| } |
There was a problem hiding this comment.
Please extract this inline handler into a function expression in lines 183ff for making it more readable.
| @@ -223,8 +230,8 @@ module.exports = function init(exec, cookieHandler, urlUtil, helpers, globalConf | |||
| return publicInterface.sendRequest(url, { method: 'options', params: params, headers: headers }, success, failure); | |||
| }; | |||
|
|
|||
| function uploadFile(url, params, headers, filePath, name, success, failure) { | |||
| return publicInterface.sendRequest(url, { method: 'upload', params: params, headers: headers, filePath: filePath, name: name }, success, failure); | |||
| function uploadFile(url, params, headers, filePath, name, success, failure, progress) { | |||
There was a problem hiding this comment.
Will this work for the https://github.com/danielsogl/awesome-cordova-plugins/ wrapper? I think it could be a problem but not sure, because usually the last two arguments are meant to be success and fail handlers. Would you please check?
If it causes problems we can keep the short-hand function uploadFile and make this functionality available only via sendRequest.
|
Hi @brunolau, been quite some time but I checked your PR again just now. Left some comments. And also I recognized you could simplify the implementation by not checking if a progress function was supplied in native code, but instead always report the progress to the webview. And the www interface file can check if a progress callback was provided. I think this will be minimal overhead, right? What do you think? |
This adds onProgress callback for uploadFile method. Useful when uploading larger files