From 531bd9966aed6e0909cf87c6309d23478ea8bcc9 Mon Sep 17 00:00:00 2001 From: Giuseppe Nucifora Date: Thu, 21 Apr 2016 12:29:24 +0200 Subject: [PATCH] - ADD isFacebookUser - MOD isFacebookUser Property to facebookUser --- PNObject.podspec | 2 +- Pod/Classes/PNClasses/PNUser.h | 8 ++++---- Pod/Classes/PNClasses/PNUser.m | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/PNObject.podspec b/PNObject.podspec index 3f695f5..5273564 100644 --- a/PNObject.podspec +++ b/PNObject.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "PNObject" -s.version = "0.7.2" +s.version = "0.7.3" s.summary = "PNObject is a simple replica of the more complex ParseObject" # This description is used to generate tags and improve search results. diff --git a/Pod/Classes/PNClasses/PNUser.h b/Pod/Classes/PNClasses/PNUser.h index 7c31614..acb46ec 100644 --- a/Pod/Classes/PNClasses/PNUser.h +++ b/Pod/Classes/PNClasses/PNUser.h @@ -122,6 +122,8 @@ - (UIImage* _Nonnull) userProfileImage:(BOOL) forceReload; +- (BOOL) isFacebookUser; + //- (void) setPassword:(NSString * _Nonnull)password inBackGroundWithBlock:(nullable void (^)(BOOL saveStatus, id responseObject, NSError * error)) responseBlock; ///-------------------------------------- @@ -200,10 +202,8 @@ * <#Description#> */ @property (nonatomic, strong, nullable) NSNumber * loginCount; -/** - * <#Description#> - */ -@property (nonatomic) BOOL isFacebookUser; + +@property (nonatomic) BOOL facebookUser; /** * <#Description#> */ diff --git a/Pod/Classes/PNClasses/PNUser.m b/Pod/Classes/PNClasses/PNUser.m index 239a464..e44be03 100644 --- a/Pod/Classes/PNClasses/PNUser.m +++ b/Pod/Classes/PNClasses/PNUser.m @@ -154,6 +154,7 @@ static bool isFirstAccess = YES; NSLogDebug(@"%@",[responseObject objectForKey:@"user"]); [[[self class] currentUser] populateObjectFromJSON:[responseObject objectForKey:@"user"]]; + [[[self class] currentUser] updateFacebookData]; [[[self class] currentUser] saveLocally]; [[NSNotificationCenter defaultCenter] postNotificationName:PNObjectLocalNotificationUserReloadFromServerSuccess object:nil]; @@ -234,6 +235,7 @@ static bool isFirstAccess = YES; [user setFacebookId:[result objectForKey:@"id"]]; [user setAuthenticated:YES]; + [user setFacebookUser:YES]; [user saveLocally]; [user reloadFormServer]; @@ -343,6 +345,24 @@ static bool isFirstAccess = YES; return self.authenticated; } +- (BOOL) isFacebookUser { + [self updateFacebookData]; + + return self.facebookUser; +} + + +- (void) updateFacebookData { + + if (self.facebookId || self.facebookAccessToken) { + self.facebookUser = YES; + } + else { + self.facebookUser = NO; + } +} + + - (UIImage* _Nonnull) userProfileImage { return [self userProfileImage:NO]; }