From 13801d0aa3740b13400770db9c365f4abfaf62ce Mon Sep 17 00:00:00 2001 From: Giuseppe Nucifora Date: Wed, 4 Jan 2017 00:12:53 +0100 Subject: [PATCH] - Fix --- Example/Podfile.lock | 4 ++-- Example/Pods/Manifest.lock | 4 ++-- .../Pod/Classes/NSDate+NSDate_Util.m | 10 ++++------ PNObject/Classes/PNObject.m | 18 +++++++++++++++--- PNObject/Classes/PNObjectConfig.h | 2 +- PNObject/Classes/PNObjectModel.m | 4 ---- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 1dd30db..afb4ebe 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -33,7 +33,7 @@ PODS: - FBSDKShareKit (4.18.0): - FBSDKCoreKit - NSDataAES (0.2.2) - - NSDate_Utils (1.0.0) + - NSDate_Utils (1.0.1) - NSString-Helper (1.0.5) - nv-ios-http-status (0.0.1) - PEAR-FileManager-iOS (1.3.1) @@ -80,7 +80,7 @@ SPEC CHECKSUMS: FBSDKLoginKit: 6773073e970b2b15fb12e451ce7f11da0532b880 FBSDKShareKit: 0b8d6cc3f103c75297eb3c62caec284a2ccf1b9e NSDataAES: 967ea3337476a80e9838a533c25d570a06855ed0 - NSDate_Utils: 45d47afab329001ccafe056308d0cc05460e5298 + NSDate_Utils: b451375dcbf9099a444c32de029c4498a5e7d58e NSString-Helper: 459e1b6a62b3bf7db10f01b0d102548608e945c4 nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3 diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 1dd30db..afb4ebe 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -33,7 +33,7 @@ PODS: - FBSDKShareKit (4.18.0): - FBSDKCoreKit - NSDataAES (0.2.2) - - NSDate_Utils (1.0.0) + - NSDate_Utils (1.0.1) - NSString-Helper (1.0.5) - nv-ios-http-status (0.0.1) - PEAR-FileManager-iOS (1.3.1) @@ -80,7 +80,7 @@ SPEC CHECKSUMS: FBSDKLoginKit: 6773073e970b2b15fb12e451ce7f11da0532b880 FBSDKShareKit: 0b8d6cc3f103c75297eb3c62caec284a2ccf1b9e NSDataAES: 967ea3337476a80e9838a533c25d570a06855ed0 - NSDate_Utils: 45d47afab329001ccafe056308d0cc05460e5298 + NSDate_Utils: b451375dcbf9099a444c32de029c4498a5e7d58e NSString-Helper: 459e1b6a62b3bf7db10f01b0d102548608e945c4 nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3 diff --git a/Example/Pods/NSDate_Utils/Pod/Classes/NSDate+NSDate_Util.m b/Example/Pods/NSDate_Utils/Pod/Classes/NSDate+NSDate_Util.m index f8f8476..b8caade 100755 --- a/Example/Pods/NSDate_Utils/Pod/Classes/NSDate+NSDate_Util.m +++ b/Example/Pods/NSDate_Utils/Pod/Classes/NSDate+NSDate_Util.m @@ -523,12 +523,10 @@ static NSDateFormatter *_displayFormatter = nil; [dateFormatter setDateFormat:dateFormat]; - NSDate *theDate = nil; - NSError *error = nil; - if (![dateFormatter getObjectValue:&theDate forString:dateString range:nil error:&error]) { - NSLog(@"Date '%@' could not be parsed: %@", dateString, error); - } - else { + NSDate *theDate = [NSDate dateFromString:dateString withFormat:dateFormat]; + + if (theDate) { + return dateFormat; } } diff --git a/PNObject/Classes/PNObject.m b/PNObject/Classes/PNObject.m index 22ce767..f74e736 100644 --- a/PNObject/Classes/PNObject.m +++ b/PNObject/Classes/PNObject.m @@ -432,9 +432,21 @@ NSString * const PNObjectMappingSelector = @"selector"; [JSONFormObject setValue:@(val) forKey:propertyName]; }, @"NSDate" : ^{ - NSString *val = [[value toLocalTime] stringWithFormat:kNSDateHelperFormatSQLDateWithTime]; - if (![self isObjNull:val]) { - [JSONFormObject setValue:val forKey:propertyName]; + NSDate *val; + + if ([value isKindOfClass:[NSString class]]) { + + NSString *str = [NSString stringWithFormat:@"%@", value]; + NSString *dateFormat = [NSDate parseDateFormatFromString:str]; + + if (dateFormat == nil) { + dateFormat = kNSDateHelperFormatSQLDateWithTime; + } + + val = [[NSDate dateFromString:str withFormat:dateFormat] toLocalTime]; + } + else { + val = [value toLocalTime]; } }, @"NSArray" : ^{ diff --git a/PNObject/Classes/PNObjectConfig.h b/PNObject/Classes/PNObjectConfig.h index 1c25c19..f8ae422 100644 --- a/PNObject/Classes/PNObjectConfig.h +++ b/PNObject/Classes/PNObjectConfig.h @@ -145,7 +145,7 @@ typedef NS_ENUM(NSInteger, OAuthMode) { - (void) setClientID:(NSString * _Nonnull) clientID clientSecret:(NSString* _Nonnull) clientSecret forEnv:(NSString * _Nonnull) environment; -- (void) setOauthUserName:(NSString * _Nonnull)oauthUserName oauthPassword:(NSString* _Nonnull) oauthPassword forEnv:(NSString *) environment; +- (void) setOauthUserName:(NSString * _Nonnull)oauthUserName oauthPassword:(NSString* _Nonnull) oauthPassword forEnv:(NSString * _Nonnull) environment; /** * <#Description#> diff --git a/PNObject/Classes/PNObjectModel.m b/PNObject/Classes/PNObjectModel.m index 8dd78ec..3c27142 100644 --- a/PNObject/Classes/PNObjectModel.m +++ b/PNObject/Classes/PNObjectModel.m @@ -146,8 +146,6 @@ static bool isFirstAccess = YES; if ([_fileManager checkPath:className]) { - NSError *error = nil; - NSData *data = [[_fileManager fetchFileDataWithPath:className] aes_decrypt:[DDDKeychainWrapper dataForKey: PNObjectEncryptionKey]]; return [NSKeyedUnarchiver unarchiveObjectWithData:data]; @@ -162,8 +160,6 @@ static bool isFirstAccess = YES; BOOL isPNObjectSubclass = [[object class] isSubclassOfClass:[PNObject class]]; - NSError *error = nil; - if(isPNObjectSubclass) { if ([[object class] conformsToProtocol:@protocol(PNObjectSubclassing)]) {