diff --git a/package.json b/package.json index 36421bd..4592171 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.5.1-dev", "description": "Cordova File Transfer Plugin", "cordova": { - "id": "org.apache.cordova.file-transfer", + "id": "cordova-plugin-file-transfer", "platforms": [ "android", "amazon-fireos", diff --git a/plugin.xml b/plugin.xml index 46868cf..217d1e5 100644 --- a/plugin.xml +++ b/plugin.xml @@ -20,7 +20,7 @@ File Transfer Cordova File Transfer Plugin diff --git a/src/ubuntu/file-transfer.cpp b/src/ubuntu/file-transfer.cpp index 9c553eb..5b1adea 100644 --- a/src/ubuntu/file-transfer.cpp +++ b/src/ubuntu/file-transfer.cpp @@ -18,7 +18,7 @@ */ #include "file-transfer.h" -#include +#include #include static void SetHeaders(QNetworkRequest &request, const QVariantMap &headers) { diff --git a/src/windows/FileTransferProxy.js b/src/windows/FileTransferProxy.js index 659e5c9..39c7c24 100644 --- a/src/windows/FileTransferProxy.js +++ b/src/windows/FileTransferProxy.js @@ -24,10 +24,10 @@ /*global module, require*/ var FTErr = require('./FileTransferError'), - ProgressEvent = require('org.apache.cordova.file.ProgressEvent'), - FileUploadResult = require('org.apache.cordova.file.FileUploadResult'), - FileProxy = require('org.apache.cordova.file.FileProxy'), - FileEntry = require('org.apache.cordova.file.FileEntry'); + ProgressEvent = require('cordova-plugin-file.ProgressEvent'), + FileUploadResult = require('cordova-plugin-file.FileUploadResult'), + FileProxy = require('cordova-plugin-file.FileProxy'), + FileEntry = require('cordova-plugin-file.FileEntry'); var appData = Windows.Storage.ApplicationData.current; diff --git a/tests/plugin.xml b/tests/plugin.xml index d3c1f8f..49d975d 100644 --- a/tests/plugin.xml +++ b/tests/plugin.xml @@ -20,7 +20,7 @@ Cordova File Transfer Plugin Tests Apache 2.0 diff --git a/www/FileTransfer.js b/www/FileTransfer.js index 17fb782..0a4c773 100644 --- a/www/FileTransfer.js +++ b/www/FileTransfer.js @@ -22,7 +22,7 @@ var argscheck = require('cordova/argscheck'), exec = require('cordova/exec'), FileTransferError = require('./FileTransferError'), - ProgressEvent = require('org.apache.cordova.file.ProgressEvent'); + ProgressEvent = require('cordova-plugin-file.ProgressEvent'); function newProgressEvent(result) { var pe = new ProgressEvent(); @@ -178,10 +178,10 @@ FileTransfer.prototype.download = function(source, target, successCallback, erro } else if (successCallback) { var entry = null; if (result.isDirectory) { - entry = new (require('org.apache.cordova.file.DirectoryEntry'))(); + entry = new (require('cordova-plugin-file.DirectoryEntry'))(); } else if (result.isFile) { - entry = new (require('org.apache.cordova.file.FileEntry'))(); + entry = new (require('cordova-plugin-file.FileEntry'))(); } entry.isDirectory = result.isDirectory; entry.isFile = result.isFile; diff --git a/www/blackberry10/FileTransferProxy.js b/www/blackberry10/FileTransferProxy.js index 438999a..a363f07 100644 --- a/www/blackberry10/FileTransferProxy.js +++ b/www/blackberry10/FileTransferProxy.js @@ -25,7 +25,7 @@ * Register all FileTransfer exec calls to be handled by proxy */ -var xhrFileTransfer = require('org.apache.cordova.file-transfer.xhrFileTransfer'); +var xhrFileTransfer = require('cordova-plugin-file-transfer.xhrFileTransfer'); module.exports = { abort: xhrFileTransfer.abort, diff --git a/www/blackberry10/xhrFileTransfer.js b/www/blackberry10/xhrFileTransfer.js index 87c8ec0..7eba7af 100644 --- a/www/blackberry10/xhrFileTransfer.js +++ b/www/blackberry10/xhrFileTransfer.js @@ -21,8 +21,8 @@ /*global Blob:false */ var cordova = require('cordova'), - resolve = cordova.require('org.apache.cordova.file.resolveLocalFileSystemURIProxy'), - requestAnimationFrame = cordova.require('org.apache.cordova.file.bb10RequestAnimationFrame'), + resolve = cordova.require('cordova-plugin-file.resolveLocalFileSystemURIProxy'), + requestAnimationFrame = cordova.require('cordova-plugin-file.bb10RequestAnimationFrame'), xhr = {}; function getParentPath(filePath) {