isKindOfClass doesn't always work with tests due to difference in tar…

…gets

Liferay-iOS-SDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 	s.name					= "Liferay-iOS-SDK"
 	s.module_name			= "LRMobileSDK"
-	s.version				= "6.2.0.17"
+	s.version				= "6.2.0.18"
 	s.summary				= "Build iOS apps for Liferay."
 	s.homepage				= "https://www.liferay.com/community/liferay-projects/liferay-mobile-sdk"
 	s.license				= {
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
 	s.ios.deployment_target	= '7.0'
 	s.source				= {
 								:git => "https://github.com/liferay/liferay-mobile-sdk.git",
-								:tag => "ios-6.2.0.17"
+								:tag => "ios-6.2.0.18"
 							}
 	s.source_files			= "ios/Source/**/*.{h,m}"
 	s.resource_bundles		= {

ios/Source/Core/LRSession.m

@@ -130,15 +130,18 @@ - (NSOperation *)upload:(NSDictionary *)command error:(NSError **)error {
 #pragma mark - Private methods
 
 - (BOOL)_hasUploadData:(NSDictionary *)command {
-	if (![command count]) {
+	if ([command count] == 0) {
 		return NO;
 	}
 
 	NSString *first = [[command allKeys] objectAtIndex:0];
 	NSDictionary *params = [command objectForKey:first];
 
 	for (NSString *key in [params allKeys]) {
-		if ([params[key] isKindOfClass:[LRUploadData class]]) {
+		NSString *paramClazz = NSStringFromClass([params[key] class]);
+		NSString *uploadDataClazz = NSStringFromClass([LRUploadData class]);
+
+		if ([paramClazz isEqualToString:uploadDataClazz]) {
 			return YES;
 		}
 	}

ios/Source/Http/LRUploadUtil.m

@@ -86,15 +86,18 @@ + (NSOperation *)upload:(LRSession *)session command:(NSDictionary *)command
 	return operation;
 }
 
-+ (LRUploadData *)_extractUploadData:(NSMutableDictionary *)parameters {
-	for (NSString *key in parameters) {
-		id parameter = [parameters objectForKey:key];
++ (LRUploadData *)_extractUploadData:(NSMutableDictionary *)params {
+	for (NSString *key in params) {
+		id param = [params objectForKey:key];
 
-		if ([parameter isKindOfClass:[LRUploadData class]]) {
-			[parameters removeObjectForKey:key];
-			[parameter setParameterName:key];
+		NSString *paramClazz = NSStringFromClass([params[key] class]);
+		NSString *uploadDataClazz = NSStringFromClass([LRUploadData class]);
 
-			return parameter;
+		if ([paramClazz isEqualToString:uploadDataClazz]) {
+			[params removeObjectForKey:key];
+			[param setParameterName:key];
+
+			return param;
 		}
 	}
 

ios/gradle.properties

@@ -8,4 +8,4 @@
 ## Build
 ##
 
-	version=6.2.0.17
+	version=6.2.0.18