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

fixed merge issue

Browse Source
This commit is contained in:
Steven Gill
2013-08-19 15:01:27 -07:00
parent 659639fba7 6a6adadfee
commit f6c4721607
8 changed files with 232 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin.xml
+9 -8
View File
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
id="org.apache.cordova.core.file-transfer"
version="0.1.0">
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.core.file-transfer"
version="0.2.0">
<name>File Transfer</name>
<description>Cordova File Transfer Plugin</description>
<license>Apache</license>
<license>Apache 2.0</license>
<keywords>cordova,file,transfer</keywords>
<dependency id="org.apache.cordova.core.file" url="https://git-wip-us.apache.org/repos/asf/cordova-plugin-file" commit="master" />
@@ -22,7 +23,7 @@
<platform name="android">
<config-file target="res/xml/config.xml" parent="/*">
<feature name="FileTransfer" >
<param name="android-package" value="org.apache.cordova.core.FileTransfer"/>
<param name="android-package" value="org.apache.cordova.filetransfer.FileTransfer"/>
</feature>
</config-file>
@@ -30,9 +31,9 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</config-file>
<source-file src="src/android/FileTransfer.java" target-dir="src/org/apache/cordova/core" />
<source-file src="src/android/FileProgressResult.java" target-dir="src/org/apache/cordova/core" />
<source-file src="src/android/FileUploadResult.java" target-dir="src/org/apache/cordova/core" />
<source-file src="src/android/FileTransfer.java" target-dir="src/org/apache/cordova/filetransfer" />
<source-file src="src/android/FileProgressResult.java" target-dir="src/org/apache/cordova/filetransfer" />
<source-file src="src/android/FileUploadResult.java" target-dir="src/org/apache/cordova/filetransfer" />
</platform>
<platform name="blackberry10">