You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/08/20 00:01:55 UTC
[01/10] git commit: [license] adding apache license file
Updated Branches:
refs/heads/master 659639fba -> f6c472160
[license] adding apache license file
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/94131974
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/94131974
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/94131974
Branch: refs/heads/master
Commit: 94131974c3e203aafbe7e80b326be5fb84d26ec1
Parents: e37895a
Author: Hardeep Shoker <sh...@gmail.com>
Authored: Tue Aug 6 14:42:09 2013 -0700
Committer: Hardeep Shoker <sh...@gmail.com>
Committed: Tue Aug 6 14:42:09 2013 -0700
----------------------------------------------------------------------
LICENSE | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 202 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/94131974/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..7a4a3ea
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
[08/10] git commit: [CB-4480] Fix up a couple Unsigned->Signed
mistakes from previous commit.
Posted by st...@apache.org.
[CB-4480] Fix up a couple Unsigned->Signed mistakes from previous commit.
Also - thanks to Klaus Schmidt for the original patch for this fix.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/a59755ec
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/a59755ec
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/a59755ec
Branch: refs/heads/master
Commit: a59755ec72cb2b8623c0b205d310138215221947
Parents: fbbfff1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Aug 2 13:51:11 2013 -0400
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 15:33:19 2013 -0700
----------------------------------------------------------------------
src/ios/CDVFileTransfer.m | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/a59755ec/src/ios/CDVFileTransfer.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVFileTransfer.m b/src/ios/CDVFileTransfer.m
index d1aef24..f1fd4d3 100644
--- a/src/ios/CDVFileTransfer.m
+++ b/src/ios/CDVFileTransfer.m
@@ -209,7 +209,7 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
NSData* postBodyAfterFile = [[NSString stringWithFormat:@"\r\n--%@--\r\n", kFormBoundary] dataUsingEncoding:NSUTF8StringEncoding];
long long totalPayloadLength = [postBodyBeforeFile length] + [fileData length] + [postBodyAfterFile length];
- [req setValue:[[NSNumber numberWithUnsignedLongLong:totalPayloadLength] stringValue] forHTTPHeaderField:@"Content-Length"];
+ [req setValue:[[NSNumber numberWithLongLong:totalPayloadLength] stringValue] forHTTPHeaderField:@"Content-Length"];
if (chunkedMode) {
CFReadStreamRef readStream = NULL;
@@ -535,7 +535,7 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
if (uploadResponse != nil) {
[uploadResult setObject:uploadResponse forKey:@"response"];
}
- [uploadResult setObject:[NSNumber numberWithUnsignedLongLong:self.bytesTransfered] forKey:@"bytesSent"];
+ [uploadResult setObject:[NSNumber numberWithLongLong:self.bytesTransfered] forKey:@"bytesSent"];
[uploadResult setObject:[NSNumber numberWithInt:self.responseCode] forKey:@"responseCode"];
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:uploadResult];
} else {
@@ -683,8 +683,8 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
}
NSMutableDictionary* downloadProgress = [NSMutableDictionary dictionaryWithCapacity:3];
[downloadProgress setObject:[NSNumber numberWithBool:lengthComputable] forKey:@"lengthComputable"];
- [downloadProgress setObject:[NSNumber numberWithUnsignedLongLong:self.bytesTransfered] forKey:@"loaded"];
- [downloadProgress setObject:[NSNumber numberWithUnsignedLongLong:self.bytesExpected] forKey:@"total"];
+ [downloadProgress setObject:[NSNumber numberWithLongLong:self.bytesTransfered] forKey:@"loaded"];
+ [downloadProgress setObject:[NSNumber numberWithLongLong:self.bytesExpected] forKey:@"total"];
CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:downloadProgress];
[result setKeepCallbackAsBool:true];
[self.command.commandDelegate sendPluginResult:result callbackId:callbackId];
@@ -697,8 +697,8 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
NSMutableDictionary* uploadProgress = [NSMutableDictionary dictionaryWithCapacity:3];
[uploadProgress setObject:[NSNumber numberWithBool:true] forKey:@"lengthComputable"];
- [uploadProgress setObject:[NSNumber numberWithUnsignedLongLong:totalBytesWritten] forKey:@"loaded"];
- [uploadProgress setObject:[NSNumber numberWithUnsignedLongLong:totalBytesExpectedToWrite] forKey:@"total"];
+ [uploadProgress setObject:[NSNumber numberWithLongLong:totalBytesWritten] forKey:@"loaded"];
+ [uploadProgress setObject:[NSNumber numberWithLongLong:totalBytesExpectedToWrite] forKey:@"total"];
CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:uploadProgress];
[result setKeepCallbackAsBool:true];
[self.command.commandDelegate sendPluginResult:result callbackId:callbackId];
[02/10] git commit: [plugin.xml] standardizing license + meta
Posted by st...@apache.org.
[plugin.xml] standardizing license + meta
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/3fa3f96a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/3fa3f96a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/3fa3f96a
Branch: refs/heads/master
Commit: 3fa3f96a94b96450db324b11a8ec2cff906eee9f
Parents: 9413197
Author: Hardeep Shoker <sh...@gmail.com>
Authored: Tue Aug 6 14:52:52 2013 -0700
Committer: Hardeep Shoker <sh...@gmail.com>
Committed: Tue Aug 6 14:52:52 2013 -0700
----------------------------------------------------------------------
plugin.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/3fa3f96a/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 8d12037..a03f790 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -4,6 +4,9 @@
id="org.apache.cordova.core.file-transfer"
version="0.1.0">
<name>File Transfer</name>
+ <description>Cordova File Transfer Plugin</description>
+ <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" subdir="/*" />
[06/10] git commit: [CB-4480] Using 64 bit ints to store file size
Posted by st...@apache.org.
[CB-4480] Using 64 bit ints to store file size
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/fbbfff12
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/fbbfff12
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/fbbfff12
Branch: refs/heads/master
Commit: fbbfff122ad18f5d2f10e31a594d6c400b5d4531
Parents: 9a12599
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Aug 2 13:46:47 2013 -0400
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 15:33:18 2013 -0700
----------------------------------------------------------------------
src/ios/CDVFileTransfer.h | 6 +++---
src/ios/CDVFileTransfer.m | 22 +++++++++++-----------
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/fbbfff12/src/ios/CDVFileTransfer.h
----------------------------------------------------------------------
diff --git a/src/ios/CDVFileTransfer.h b/src/ios/CDVFileTransfer.h
index 2231ee3..8e8211d 100644
--- a/src/ios/CDVFileTransfer.h
+++ b/src/ios/CDVFileTransfer.h
@@ -60,7 +60,7 @@ extern NSString* const kOptionsKeyCookie;
@interface CDVFileTransferDelegate : NSObject {}
-- (void)updateBytesExpected:(NSInteger)newBytesExpected;
+- (void)updateBytesExpected:(long long)newBytesExpected;
- (void)cancelTransfer:(NSURLConnection*)connection;
@property (strong) NSMutableData* responseData; // atomic
@@ -73,8 +73,8 @@ extern NSString* const kOptionsKeyCookie;
@property (nonatomic, copy) NSString* target;
@property (nonatomic, copy) NSString* mimeType;
@property (assign) int responseCode; // atomic
-@property (nonatomic, assign) NSInteger bytesTransfered;
-@property (nonatomic, assign) NSInteger bytesExpected;
+@property (nonatomic, assign) long long bytesTransfered;
+@property (nonatomic, assign) long long bytesExpected;
@property (nonatomic, assign) BOOL trustAllHosts;
@property (strong) NSFileHandle* targetFileHandle;
@property (nonatomic, strong) CDVFileTransferEntityLengthRequest* entityLengthRequest;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/fbbfff12/src/ios/CDVFileTransfer.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVFileTransfer.m b/src/ios/CDVFileTransfer.m
index 92070d1..d1aef24 100644
--- a/src/ios/CDVFileTransfer.m
+++ b/src/ios/CDVFileTransfer.m
@@ -49,8 +49,8 @@ NSString* const kFormBoundary = @"+++++org.apache.cordova.formBoundary";
static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
{
UInt8* bytes = (UInt8*)[data bytes];
- NSUInteger bytesToWrite = [data length];
- NSUInteger totalBytesWritten = 0;
+ long long bytesToWrite = [data length];
+ long long totalBytesWritten = 0;
while (totalBytesWritten < bytesToWrite) {
CFIndex result = CFWriteStreamWrite(stream,
@@ -208,8 +208,8 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
DLog(@"fileData length: %d", [fileData length]);
NSData* postBodyAfterFile = [[NSString stringWithFormat:@"\r\n--%@--\r\n", kFormBoundary] dataUsingEncoding:NSUTF8StringEncoding];
- NSUInteger totalPayloadLength = [postBodyBeforeFile length] + [fileData length] + [postBodyAfterFile length];
- [req setValue:[[NSNumber numberWithInteger:totalPayloadLength] stringValue] forHTTPHeaderField:@"Content-Length"];
+ long long totalPayloadLength = [postBodyBeforeFile length] + [fileData length] + [postBodyAfterFile length];
+ [req setValue:[[NSNumber numberWithUnsignedLongLong:totalPayloadLength] stringValue] forHTTPHeaderField:@"Content-Length"];
if (chunkedMode) {
CFReadStreamRef readStream = NULL;
@@ -535,7 +535,7 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
if (uploadResponse != nil) {
[uploadResult setObject:uploadResponse forKey:@"response"];
}
- [uploadResult setObject:[NSNumber numberWithInt:self.bytesTransfered] forKey:@"bytesSent"];
+ [uploadResult setObject:[NSNumber numberWithUnsignedLongLong:self.bytesTransfered] forKey:@"bytesSent"];
[uploadResult setObject:[NSNumber numberWithInt:self.responseCode] forKey:@"responseCode"];
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:uploadResult];
} else {
@@ -665,9 +665,9 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
[self updateProgress];
}
-- (void)updateBytesExpected:(NSInteger)newBytesExpected
+- (void)updateBytesExpected:(long long)newBytesExpected
{
- DLog(@"Updating bytesExpected to %d", newBytesExpected);
+ DLog(@"Updating bytesExpected to %lld", newBytesExpected);
self.bytesExpected = newBytesExpected;
[self updateProgress];
}
@@ -683,8 +683,8 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
}
NSMutableDictionary* downloadProgress = [NSMutableDictionary dictionaryWithCapacity:3];
[downloadProgress setObject:[NSNumber numberWithBool:lengthComputable] forKey:@"lengthComputable"];
- [downloadProgress setObject:[NSNumber numberWithInt:self.bytesTransfered] forKey:@"loaded"];
- [downloadProgress setObject:[NSNumber numberWithInt:self.bytesExpected] forKey:@"total"];
+ [downloadProgress setObject:[NSNumber numberWithUnsignedLongLong:self.bytesTransfered] forKey:@"loaded"];
+ [downloadProgress setObject:[NSNumber numberWithUnsignedLongLong:self.bytesExpected] forKey:@"total"];
CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:downloadProgress];
[result setKeepCallbackAsBool:true];
[self.command.commandDelegate sendPluginResult:result callbackId:callbackId];
@@ -697,8 +697,8 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
NSMutableDictionary* uploadProgress = [NSMutableDictionary dictionaryWithCapacity:3];
[uploadProgress setObject:[NSNumber numberWithBool:true] forKey:@"lengthComputable"];
- [uploadProgress setObject:[NSNumber numberWithInt:totalBytesWritten] forKey:@"loaded"];
- [uploadProgress setObject:[NSNumber numberWithInt:totalBytesExpectedToWrite] forKey:@"total"];
+ [uploadProgress setObject:[NSNumber numberWithUnsignedLongLong:totalBytesWritten] forKey:@"loaded"];
+ [uploadProgress setObject:[NSNumber numberWithUnsignedLongLong:totalBytesExpectedToWrite] forKey:@"total"];
CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:uploadProgress];
[result setKeepCallbackAsBool:true];
[self.command.commandDelegate sendPluginResult:result callbackId:callbackId];
[05/10] git commit: updated namespace, name tag and readme
Posted by st...@apache.org.
updated namespace, name tag and readme
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/d50689cd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/d50689cd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/d50689cd
Branch: refs/heads/master
Commit: d50689cd43b35cc398c9d30e164deb8827c2b6ee
Parents: 8f920d2
Author: Steven Gill <st...@gmail.com>
Authored: Wed Jul 24 14:37:20 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 15:33:18 2013 -0700
----------------------------------------------------------------------
README.md | 2 +-
plugin.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/d50689cd/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 603e478..42a24d9 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,4 @@ cordova-plugin-file-transfer
----------------------------
To install this plugin, follow the [Command-line Interface Guide](http://cordova.apache.org/docs/en/edge/guide_cli_index.md.html#The%20Command-line%20Interface).
-If you are not using the Cordova Command-line Interface, follow [Using Plugman to Manage Plugins](http://cordova.apache.org/docs/en/edge/guide_plugin_ref_plugman.md.html).
+If you are not using the Cordova Command-line Interface, follow [Using Plugman to Manage Plugins](http://cordova.apache.org/docs/en/edge/plugin_ref_plugman.md.html).
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/d50689cd/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 7887241..6534365 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
-xmlns:android="http://schemas.android.com/apk/res/android"
- 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.1.0">
<name>File Transfer</name>
<description>Cordova File Transfer Plugin</description>
<license>Apache 2.0</license>
[04/10] git commit: Fix NPE in mobile-spec Upload of an unknown host
test.
Posted by st...@apache.org.
Fix NPE in mobile-spec Upload of an unknown host test.
Was happening over cell connection.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/a8301168
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/a8301168
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/a8301168
Branch: refs/heads/master
Commit: a83011685dc13e136685dda9fc5e77088f2afe70
Parents: d50689c
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jul 30 11:35:09 2013 -0400
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 15:33:18 2013 -0700
----------------------------------------------------------------------
src/android/FileTransfer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/a8301168/src/android/FileTransfer.java
----------------------------------------------------------------------
diff --git a/src/android/FileTransfer.java b/src/android/FileTransfer.java
index c4b5dd1..f324482 100644
--- a/src/android/FileTransfer.java
+++ b/src/android/FileTransfer.java
@@ -595,7 +595,8 @@ public class FileTransfer extends CordovaPlugin {
body = bodyBuilder.toString();
}
}
- } catch (IOException e) {
+ // IOException can leave connection object in a bad state, so catch all exceptions.
+ } catch (Throwable e) {
Log.w(LOG_TAG, "Error getting HTTP status code from connection.", e);
}
}
[09/10] git commit: CB-4595: updated version
Posted by st...@apache.org.
CB-4595: updated version
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/6a6adadf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/6a6adadf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/6a6adadf
Branch: refs/heads/master
Commit: 6a6adadfee3bd8624c9b29c7a8010864b689a115
Parents: a59755e
Author: Steven Gill <st...@gmail.com>
Authored: Mon Aug 19 14:59:04 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Aug 19 14:59:04 2013 -0700
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/6a6adadf/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 7568c6a..dd81853 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
<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.1.0">
+ version="0.2.0">
<name>File Transfer</name>
<description>Cordova File Transfer Plugin</description>
<license>Apache 2.0</license>
[03/10] git commit: [plugin.xml] adding android namespace
Posted by st...@apache.org.
[plugin.xml] adding android namespace
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/8f920d27
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/8f920d27
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/8f920d27
Branch: refs/heads/master
Commit: 8f920d277242ca2d241ed5722c1c9001cebc193a
Parents: 3fa3f96
Author: Hardeep Shoker <sh...@gmail.com>
Authored: Tue Aug 6 15:40:43 2013 -0700
Committer: Hardeep Shoker <sh...@gmail.com>
Committed: Tue Aug 6 15:40:43 2013 -0700
----------------------------------------------------------------------
plugin.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/8f920d27/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index a03f790..7887241 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
+xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.core.file-transfer"
version="0.1.0">
<name>File Transfer</name>
[10/10] git commit: fixed merge issue
Posted by st...@apache.org.
fixed merge issue
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/f6c47216
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/f6c47216
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/f6c47216
Branch: refs/heads/master
Commit: f6c4721607cb2d98f27bd77015b75f0db47aa4ba
Parents: 659639f 6a6adad
Author: Steven Gill <st...@gmail.com>
Authored: Mon Aug 19 15:01:27 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Aug 19 15:01:27 2013 -0700
----------------------------------------------------------------------
LICENSE | 202 +++++++++++++++++++++++++++++++
README.md | 2 +-
plugin.xml | 17 +--
src/android/FileProgressResult.java | 2 +-
src/android/FileTransfer.java | 6 +-
src/android/FileUploadResult.java | 2 +-
src/ios/CDVFileTransfer.h | 6 +-
src/ios/CDVFileTransfer.m | 22 ++--
8 files changed, 232 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/f6c47216/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index acd24d9,dd81853..bb36fa9
--- a/plugin.xml
+++ b/plugin.xml
@@@ -1,14 -1,15 +1,15 @@@
<?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" subdir="/*" />
+ <dependency id="org.apache.cordova.core.file" url="https://git-wip-us.apache.org/repos/asf/cordova-plugin-file" commit="master" />
<js-module src="www/FileTransferError.js" name="FileTransferError">
<clobbers target="window.FileTransferError" />
[07/10] git commit: [CB-4417] Move cordova-plugin-file-transfer to
its own Java package.
Posted by st...@apache.org.
[CB-4417] Move cordova-plugin-file-transfer to its own Java package.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/9a125991
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/9a125991
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/9a125991
Branch: refs/heads/master
Commit: 9a125991f76d3094aa903b3e851cb8a06a1571e1
Parents: a830116
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Jul 31 19:57:24 2013 -0400
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Aug 14 15:33:18 2013 -0700
----------------------------------------------------------------------
plugin.xml | 8 ++++----
src/android/FileProgressResult.java | 2 +-
src/android/FileTransfer.java | 3 ++-
src/android/FileUploadResult.java | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/9a125991/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 6534365..7568c6a 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -23,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>
@@ -31,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">
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/9a125991/src/android/FileProgressResult.java
----------------------------------------------------------------------
diff --git a/src/android/FileProgressResult.java b/src/android/FileProgressResult.java
index 045a846..76a7b13 100644
--- a/src/android/FileProgressResult.java
+++ b/src/android/FileProgressResult.java
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.cordova.core;
+package org.apache.cordova.filetransfer;
import org.json.JSONException;
import org.json.JSONObject;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/9a125991/src/android/FileTransfer.java
----------------------------------------------------------------------
diff --git a/src/android/FileTransfer.java b/src/android/FileTransfer.java
index f324482..f3ab9a0 100644
--- a/src/android/FileTransfer.java
+++ b/src/android/FileTransfer.java
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.cordova.core;
+package org.apache.cordova.filetransfer;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
@@ -53,6 +53,7 @@ import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.CordovaResourceApi;
import org.apache.cordova.CordovaResourceApi.OpenForReadResult;
import org.apache.cordova.PluginResult;
+import org.apache.cordova.file.FileUtils;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/9a125991/src/android/FileUploadResult.java
----------------------------------------------------------------------
diff --git a/src/android/FileUploadResult.java b/src/android/FileUploadResult.java
index f0fbde9..c24ea78 100644
--- a/src/android/FileUploadResult.java
+++ b/src/android/FileUploadResult.java
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.cordova.core;
+package org.apache.cordova.filetransfer;
import org.json.JSONException;
import org.json.JSONObject;