You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/03/21 16:24:52 UTC
[1/2] git commit: [ios] Cleanup extra semicolons
Repository: cordova-plugin-file-transfer
Updated Branches:
refs/heads/dev 0f84287df -> 449df5584
[ios] Cleanup extra semicolons
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/653ec00f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/653ec00f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/653ec00f
Branch: refs/heads/dev
Commit: 653ec00fa65528afba0a203f364600f8999ccc9f
Parents: 0f84287
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri Mar 21 11:09:50 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Fri Mar 21 11:23:01 2014 -0400
----------------------------------------------------------------------
src/ios/CDVFileTransfer.h | 2 +-
src/ios/CDVFileTransfer.m | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/653ec00f/src/ios/CDVFileTransfer.h
----------------------------------------------------------------------
diff --git a/src/ios/CDVFileTransfer.h b/src/ios/CDVFileTransfer.h
index aea9b2d..9c4bcf1 100644
--- a/src/ios/CDVFileTransfer.h
+++ b/src/ios/CDVFileTransfer.h
@@ -84,4 +84,4 @@ extern NSString* const kOptionsKeyCookie;
@property (nonatomic, strong) CDVFileTransferEntityLengthRequest* entityLengthRequest;
@property (nonatomic, strong) CDVFile *filePlugin;
-@end;
+@end
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/653ec00f/src/ios/CDVFileTransfer.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVFileTransfer.m b/src/ios/CDVFileTransfer.m
index 1e62438..e35e262 100644
--- a/src/ios/CDVFileTransfer.m
+++ b/src/ios/CDVFileTransfer.m
@@ -492,9 +492,9 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
- (CDVFileTransferEntityLengthRequest*)initWithOriginalRequest:(NSURLRequest*)originalRequest andDelegate:(CDVFileTransferDelegate*)originalDelegate;
-@end;
+@end
-@implementation CDVFileTransferEntityLengthRequest;
+@implementation CDVFileTransferEntityLengthRequest
- (CDVFileTransferEntityLengthRequest*)initWithOriginalRequest:(NSURLRequest*)originalRequest andDelegate:(CDVFileTransferDelegate*)originalDelegate
{
@@ -765,4 +765,4 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
return self;
}
-@end;
+@end
[2/2] git commit: [ios] Cast id references to NSURL to avoid compiler
warnings (Fixes: apache/cordova-plugin-file-transfer#18)
Posted by ia...@apache.org.
[ios] Cast id references to NSURL to avoid compiler warnings (Fixes: apache/cordova-plugin-file-transfer#18)
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/449df558
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/449df558
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/449df558
Branch: refs/heads/dev
Commit: 449df558480b12afc048af01138be7c0d4f8699a
Parents: 653ec00
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri Mar 21 11:22:46 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Fri Mar 21 11:23:11 2014 -0400
----------------------------------------------------------------------
src/ios/CDVFileTransfer.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/449df558/src/ios/CDVFileTransfer.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVFileTransfer.m b/src/ios/CDVFileTransfer.m
index e35e262..3753993 100644
--- a/src/ios/CDVFileTransfer.m
+++ b/src/ios/CDVFileTransfer.m
@@ -293,7 +293,7 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
return;
} else {
// Extract the path part out of a file: URL.
- NSString* filePath = [source hasPrefix:@"/"] ? [source copy] : [[NSURL URLWithString:source] path];
+ NSString* filePath = [source hasPrefix:@"/"] ? [source copy] : [(NSURL *)[NSURL URLWithString:source] path];
if (filePath == nil) {
// We couldn't find the asset. Send the appropriate error.
CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:[self createFileTransferError:NOT_FOUND_ERR AndSource:source AndTarget:server]];
@@ -646,7 +646,7 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
filePath = [fs filesystemPathForURL:sourceURL];
} else {
// Extract the path part out of a file: URL.
- NSString* filePath = [self.target hasPrefix:@"/"] ? [self.target copy] : [[NSURL URLWithString:self.target] path];
+ NSString* filePath = [self.target hasPrefix:@"/"] ? [self.target copy] : [(NSURL *)[NSURL URLWithString:self.target] path];
if (filePath == nil) {
// We couldn't find the asset. Send the appropriate error.
[self cancelTransferWithError:connection errorMessage:[NSString stringWithFormat:@"Could not create target file"]];