This is an automated email from the ASF dual-hosted git repository. jcesarmobile pushed a commit to branch windows-leftovers in repository https://gitbox.apache.org/repos/asf/cordova-plugin-file-transfer.git
commit 702d450d95f7a64c81a9fd5524ea0e006f2d8d24 Author: jcesarmobile <[email protected]> AuthorDate: Fri Sep 1 01:33:38 2023 +0200 chore: remove windows leftovers --- tests/tests.js | 29 ++++++----------------------- www/FileTransfer.js | 23 ----------------------- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/tests/tests.js b/tests/tests.js index e917ae3..9c92cfc 100644 --- a/tests/tests.js +++ b/tests/tests.js @@ -51,9 +51,7 @@ exports.defineAutoTests = function () { let SERVER_WITH_CREDENTIALS = ''; // flags - const isWindows = cordova.platformId === 'windows'; const isBrowser = cordova.platformId === 'browser'; - const isWindowsPhone = isWindows && WinJS.Utilities.isPhone; const isIE = isBrowser && navigator.userAgent.indexOf('Trident') >= 0; const isIos = cordova.platformId === 'ios'; const isIot = cordova.platformId === 'android' && navigator.userAgent.indexOf('iot') >= 0; @@ -488,11 +486,6 @@ exports.defineAutoTests = function () { it( 'filetransfer.spec.7 should download a file using file:// (when hosted from file://)', function (done) { - // for Windows platform it's ms-appdata:/// by default, not file:// - if (isWindows) { - pending(); - return; - } const fileURL = window.location.protocol + '//' + window.location.pathname.replace(/ /g, '%20'); const specContext = this; @@ -557,7 +550,7 @@ exports.defineAutoTests = function () { specContext.transfer.download(fileURL, specContext.localFilePath, downloadWin, downloadFail); }, - isWindows ? LONG_TIMEOUT : DOWNLOAD_TIMEOUT + DOWNLOAD_TIMEOUT ); it( @@ -625,7 +618,7 @@ exports.defineAutoTests = function () { specContext.transfer.download(fileURL, specContext.localFilePath, downloadWin, downloadFail); }, - isWindows ? LONG_TIMEOUT : DOWNLOAD_TIMEOUT + DOWNLOAD_TIMEOUT ); it( @@ -752,7 +745,7 @@ exports.defineAutoTests = function () { this.transfer.download(fileURL, this.localFilePath, downloadWin, downloadFail); }, - isWindows ? LONG_TIMEOUT : DOWNLOAD_TIMEOUT + DOWNLOAD_TIMEOUT ); it('filetransfer.spec.16 should handle bad file path', function (done) { @@ -806,11 +799,7 @@ exports.defineAutoTests = function () { expect(nativeURL).toBeTruthy(); expect(nativeURL).toEqual(jasmine.any(String)); - if (isWindows) { - expect(nativeURL.substring(0, 14)).toBe('ms-appdata:///'); - } else { - expect(nativeURL.substring(0, 7)).toBe('file://'); - } + expect(nativeURL.substring(0, 7)).toBe('file://'); done(); }; @@ -1156,9 +1145,9 @@ exports.defineAutoTests = function () { }, GRACE_TIME_DELTA); }; - // windows store and ios are too fast, win is called before we have a chance to abort + // ios is too fast, win is called before we have a chance to abort // so let's get them busy - while not providing an extra load to the slow Android emulators - const arrayLength = (isWindows && !isWindowsPhone) || isIos ? 3000000 : isIot ? 150000 : 200000; + const arrayLength = isIos ? 3000000 : isIot ? 150000 : 200000; writeFile(specContext.root, specContext.fileName, new Array(arrayLength).join('aborttest!'), fileWin, done); }, UPLOAD_TIMEOUT @@ -1746,9 +1735,6 @@ exports.defineAutoTests = function () { it( 'filetransfer.spec.43 chunkedMode=true, multipart=false', function (done) { - if (isWindows) { - pending(); - } testChunkedModeBase.call(this, true, false, done); }, UPLOAD_TIMEOUT * 11 @@ -1765,9 +1751,6 @@ exports.defineAutoTests = function () { it( 'filetransfer.spec.45 chunkedMode=true, multipart=true', function (done) { - if (isWindows) { - pending(); - } testChunkedModeBase.call(this, true, true, done); }, UPLOAD_TIMEOUT * 11 diff --git a/www/FileTransfer.js b/www/FileTransfer.js index 73c6a08..06d3a12 100644 --- a/www/FileTransfer.js +++ b/www/FileTransfer.js @@ -64,20 +64,6 @@ function getBasicAuthHeader (urlString) { return header; } -function convertHeadersToArray (headers) { - const result = []; - for (const header in headers) { - if (Object.prototype.hasOwnProperty.call(headers, header)) { - const headerValue = headers[header]; - result.push({ - name: header, - value: headerValue.toString() - }); - } - } - return result; -} - let idCounter = 0; /** @@ -139,11 +125,6 @@ FileTransfer.prototype.upload = function (filePath, server, successCallback, err } } - if (cordova.platformId === 'windowsphone') { - headers = headers && convertHeadersToArray(headers); - params = params && convertHeadersToArray(params); - } - const fail = errorCallback && function (e) { @@ -205,10 +186,6 @@ FileTransfer.prototype.download = function (source, target, successCallback, err headers = options.headers || null; } - if (cordova.platformId === 'windowsphone' && headers) { - headers = convertHeadersToArray(headers); - } - const win = function (result) { if (typeof result.lengthComputable !== 'undefined') { if (self.onprogress) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
