CB-5466: Revert: we're not ready yes for FS urls in file-transfer
diff --git a/autotest/tests/filetransfer.tests.js b/autotest/tests/filetransfer.tests.js
index c0f0323..304eea1 100644
--- a/autotest/tests/filetransfer.tests.js
+++ b/autotest/tests/filetransfer.tests.js
@@ -127,7 +127,7 @@
ft.onprogress = function(e) {
lastProgressEvent = e;
};
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, fail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, fail);
});
waitsForAny(downloadWin, fail);
@@ -151,7 +151,7 @@
ft.onprogress = function(e) {
lastProgressEvent = e;
};
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, fail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, fail);
});
waitsForAny(downloadWin, fail);
@@ -171,7 +171,7 @@
});
runs(function() {
var ft = new FileTransfer();
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail);
});
waitsForAny(downloadWin, downloadFail);
@@ -200,7 +200,7 @@
ft.onprogress = function(e) {
lastProgressEvent = e;
};
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, fail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, fail);
waitsForAny(downloadWin, fail);
});
@@ -222,7 +222,7 @@
runs(function() {
var ft = new FileTransfer();
console.log("8");
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail);
});
waitsForAny(fileWin, downloadFail, fileFail);
@@ -248,7 +248,7 @@
ft.abort();
}
};
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail);
});
waitsForAny(downloadWin, downloadFail);
@@ -270,7 +270,7 @@
runs(function() {
var ft = new FileTransfer();
ft.abort(); // should be a no-op.
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail);
ft.abort();
ft.abort(); // should be a no-op.
});
@@ -290,7 +290,7 @@
runs(function() {
var ft = new FileTransfer();
ft.abort(); // should be a no-op.
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail);
ft.abort();
ft.abort(); // should be a no-op.
});
@@ -312,7 +312,7 @@
});
runs(function() {
var ft = new FileTransfer();
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail);
});
waitsForAny(downloadWin, downloadFail);
@@ -332,7 +332,7 @@
});
runs(function() {
var ft = new FileTransfer();
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail);
});
waitsForAny(downloadWin, downloadFail);
@@ -355,7 +355,7 @@
});
runs(function() {
var ft = new FileTransfer();
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail);
});
waitsForAny(downloadWin, downloadFail);
@@ -371,7 +371,7 @@
runs(function() {
var ft = new FileTransfer();
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail);
});
waitsForAny(downloadWin, downloadFail);
@@ -411,7 +411,7 @@
ft.onprogress = function(e) {
lastProgressEvent = e;
};
- ft.download(remoteFile, root.toURL() + "/" + localFileName, downloadWin, downloadFail);
+ ft.download(remoteFile, root.fullPath + "/" + localFileName, downloadWin, downloadFail);
});
waitsForAny(downloadWin, downloadFail);
});
@@ -453,7 +453,7 @@
};
// removing options cause Android to timeout
- ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options);
+ ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options);
};
this.after(function() {
@@ -504,7 +504,7 @@
};
// removing options cause Android to timeout
- ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options);
+ ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options);
};
this.after(function() {
@@ -538,7 +538,7 @@
options.fileName=fileEntry.name;
options.mimeType="text/plain";
- ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options);
+ ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options);
};
this.after(function() {
@@ -574,7 +574,7 @@
startTime = +new Date();
// removing options cause Android to timeout
ft.abort(); // should be a no-op.
- ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options);
+ ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options);
ft.abort();
ft.abort(); // should be a no-op.
};
@@ -607,7 +607,7 @@
options.fileName=fileEntry.name;
options.mimeType="text/plain";
- ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options);
+ ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options);
};
this.after(function() {
@@ -631,7 +631,7 @@
});
var fileWin = function(fileEntry) {
var ft = new FileTransfer();
- ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, {});
+ ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, {});
};
this.after(function() {
@@ -655,7 +655,7 @@
});
var fileWin = function(fileEntry) {
var ft = new FileTransfer();
- ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, {});
+ ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, {});
};
this.after(function() {
@@ -680,7 +680,7 @@
runs(function() {
var ft = new FileTransfer();
- ft.upload(root.toURL() + "/" + localFileName, remoteFile, uploadWin, uploadFail);
+ ft.upload(root.fullPath + "/" + localFileName, remoteFile, uploadWin, uploadFail);
});
waitsForAny(uploadWin, uploadFail);
@@ -735,7 +735,7 @@
};
// removing options cause Android to timeout
- ft.upload(fileEntry.toURL(), remoteFile, uploadWin, uploadFail, options);
+ ft.upload(fileEntry.fullPath, remoteFile, uploadWin, uploadFail, options);
};
this.after(function() {