Skip to content

Commit

Permalink
Rename the dialog constants
Browse files Browse the repository at this point in the history
  • Loading branch information
@hiddenmemory
hiddenmemory committed Jun 4, 2012
1 parent e76f85e commit 466399f
Show file tree
Hide file tree
Showing 12 changed files with 53 additions and 54 deletions.
12 changes: 6 additions & 6 deletions sample/Hackbook/Hackbook/APICallsViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ - (void)apiDialogFeedUser {
[[Facebook shared] dialog:@"feed"
parameters:params
finalize:^(FBDialog *dialog) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FacebookDialogState state) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FBDialogState state) {
if (![url query]) {
NSLog(@"User canceled dialog or there was an error");
return;
Expand Down Expand Up @@ -442,7 +442,7 @@ - (void)apiDialogFeedFriend:(NSString *)friendID {
[[Facebook shared] dialog:@"feed"
parameters:params
finalize:^(FBDialog *dialog) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FacebookDialogState state) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FBDialogState state) {
if (![url query]) {
NSLog(@"User canceled dialog or there was an error");
return;
Expand Down Expand Up @@ -485,7 +485,7 @@ - (void)apiDialogRequestsSendToMany {
[[Facebook shared] dialog:@"apprequests"
parameters:params
finalize:^(FBDialog *dialog) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FacebookDialogState state) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FBDialogState state) {
if (![url query]) {
NSLog(@"User canceled dialog or there was an error");
return;
Expand Down Expand Up @@ -526,7 +526,7 @@ - (void)apiDialogRequestsSendToNonUsers:(NSArray *)selectIDs {
[[Facebook shared] dialog:@"apprequests"
parameters:params
finalize:^(FBDialog *dialog) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FacebookDialogState state) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FBDialogState state) {
if (![url query]) {
NSLog(@"User canceled dialog or there was an error");
return;
Expand Down Expand Up @@ -566,7 +566,7 @@ - (void)apiDialogRequestsSendToUsers:(NSArray *)selectIDs {
[[Facebook shared] dialog:@"apprequests"
parameters:params
finalize:^(FBDialog *dialog) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FacebookDialogState state) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FBDialogState state) {
if (![url query]) {
NSLog(@"User canceled dialog or there was an error");
return;
Expand Down Expand Up @@ -604,7 +604,7 @@ - (void)apiDialogRequestsSendTarget:(NSString *)friend {
[[Facebook shared] dialog:@"apprequests"
parameters:params
finalize:^(FBDialog *dialog) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FacebookDialogState state) {
[dialog addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FBDialogState state) {
if (![url query]) {
NSLog(@"User canceled dialog or there was an error");
return;
Expand Down
4 changes: 2 additions & 2 deletions sample/Hackbook/Hackbook/RootViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ - (void)updateLoggedOut {
- (void)viewDidLoad {
[super viewDidLoad];

[[Facebook shared] addLoginHandler:^(Facebook *facebook, FacebookLoginState state) {
if( state == FacebookDialogSuccess ) {
[[Facebook shared] addLoginHandler:^(Facebook *facebook, FBLoginState state) {
if( state == kFBDialogSuccess ) {
[self updateLoggedIn];
}
else {
Expand Down
14 changes: 7 additions & 7 deletions src/FBDialog+Delegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ - (void)setDelegate:(id<FBDialogDelegate>)delegate {
if( [weakSelf.delegate respondsToSelector:@selector(dialogDidComplete:)] ||
[weakSelf.delegate respondsToSelector:@selector(dialogWasCancelled:)] )
{
[self addCompletionHandler:^(FBDialog *dialog, FacebookDialogState state) {
[self addCompletionHandler:^(FBDialog *dialog, FBDialogState state) {
switch (state) {
case FacebookDialogSuccess:
case kFBDialogSuccess:
{
if( [weakSelf.delegate respondsToSelector:@selector(dialogDidComplete:)] )
{
[weakSelf.delegate dialogDidComplete:dialog];
}
}
break;
case FacebookDialogCancelled:
case kFBDialogCancelled:
{
if( [weakSelf.delegate respondsToSelector:@selector(dialogWasCancelled:)] )
{
Expand All @@ -51,19 +51,19 @@ - (void)setDelegate:(id<FBDialogDelegate>)delegate {
[weakSelf.delegate respondsToSelector:@selector(dialog:didNotCompleteWithURL:)] )
{

[self addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FacebookDialogState state) {
[self addCompletionURLHandler:^(FBDialog *dialog, NSURL *url, FBDialogState state) {

switch (state) {
case FacebookDialogSuccess:
case kFBDialogSuccess:
{
if( [weakSelf.delegate respondsToSelector:@selector(dialog:didCompleteWithURL:)] )
{
[weakSelf.delegate dialog:dialog didCompleteWithURL:url];
}
}
break;
case FacebookDialogCancelled:
case FacebookDialogFailed:
case kFBDialogCancelled:
case kFBDialogFailed:
{
if( [weakSelf.delegate respondsToSelector:@selector(dialog:didNotCompleteWithURL:)] )
{
Expand Down
12 changes: 6 additions & 6 deletions src/FBDialog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
#import "FBBlockHandler.h"

typedef enum {
FacebookDialogSuccess,
FacebookDialogCancelled,
FacebookDialogFailed
} FacebookDialogState;
kFBDialogSuccess,
kFBDialogCancelled,
kFBDialogFailed
} FBDialogState;

@protocol FBDialogDelegate;
@class FBFrictionlessRequestSettings;
Expand Down Expand Up @@ -120,8 +120,8 @@ frictionlessSettings: (FBFrictionlessRequestSettings *) frictionlessSettings;
- (void)dialogDidCancel:(NSURL *)url;


- (void)addCompletionHandler:(void(^)(FBDialog *dialog, FacebookDialogState state))completionHandler;
- (void)addCompletionURLHandler:(void(^)(FBDialog *dialog, NSURL *url, FacebookDialogState state))completionURLHandler;
- (void)addCompletionHandler:(void(^)(FBDialog *dialog, FBDialogState state))completionHandler;
- (void)addCompletionURLHandler:(void(^)(FBDialog *dialog, NSURL *url, FBDialogState state))completionURLHandler;
- (void)addErrorHandler:(void (^)(FBDialog *dialog, NSError *error))errorHandler;


Expand Down
16 changes: 8 additions & 8 deletions src/FBDialog.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ @implementation FBDialog
///////////////////////////////////////////////////////////////////////////////////////////////////
// private

-(void)addCompletionHandler:(void(^)(FBDialog*, FacebookDialogState state))completionHandler{
-(void)addCompletionHandler:(void(^)(FBDialog*, FBDialogState state))completionHandler{
[blocks registerEventHandler:kFBCompletionBlockHandlerKey handler:completionHandler];
}

- (void)addCompletionURLHandler:(void(^)(FBDialog *dialog, NSURL *url, FacebookDialogState state))completionURLHandler{
- (void)addCompletionURLHandler:(void(^)(FBDialog *dialog, NSURL *url, FBDialogState state))completionURLHandler{
[blocks registerEventHandler:kFBCompletionURLBlockHandlerKey handler:completionURLHandler];
}

Expand Down Expand Up @@ -656,8 +656,8 @@ - (void)show {

- (void)dismissWithSuccess:(BOOL)success animated:(BOOL)animated {
[blocks enumerateEventHandlers:kFBCompletionBlockHandlerKey block:^(id _handler) {
void (^handler)(FBDialog*,FacebookDialogState) = _handler;
handler(self, (success ? FacebookDialogSuccess : FacebookDialogCancelled));
void (^handler)(FBDialog*,FBDialogState) = _handler;
handler(self, (success ? kFBDialogSuccess : kFBDialogCancelled));
}];

[self dismiss:animated];
Expand All @@ -680,16 +680,16 @@ - (void)dialogWillDisappear {

- (void)dialogDidSucceed:(NSURL *)url {
[blocks enumerateEventHandlers:kFBCompletionURLBlockHandlerKey block:^(id _handler) {
void (^handler)(FBDialog*,NSURL*,FacebookDialogState) = _handler;
handler(self, url, FacebookDialogSuccess);
void (^handler)(FBDialog*,NSURL*,FBDialogState) = _handler;
handler(self, url, kFBDialogSuccess);
}];
[self dismissWithSuccess:YES animated:YES];
}

- (void)dialogDidCancel:(NSURL *)url {
[blocks enumerateEventHandlers:kFBCompletionURLBlockHandlerKey block:^(id _handler) {
void (^handler)(FBDialog*,NSURL*,FacebookDialogState) = _handler;
handler(self, url, FacebookDialogCancelled);
void (^handler)(FBDialog*,NSURL*,FBDialogState) = _handler;
handler(self, url, kFBDialogCancelled);
}];
[self dismissWithSuccess:NO animated:YES];
}
Expand Down
2 changes: 1 addition & 1 deletion src/FBLoginDialog+Delegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

@protocol FBLoginDialogDelegate <NSObject>

- (void)facebookDialogDidLogin:(NSString*)token expirationDate:(NSDate*)expirationDate;
- (void)kFBDialogDidLogin:(NSString*)token expirationDate:(NSDate*)expirationDate;

- (void)facebookbDialogDidNotLogin:(BOOL)cancelled;

Expand Down
8 changes: 4 additions & 4 deletions src/FBLoginDialog+Delegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ - (void)setDelegate:(id<FBLoginDialogDelegate>)delegate {

if (oldDelegate) return;

[self addLoginHandler:^( FacebookDialogState state, NSString *token, NSDate *expirationDate ) {
[self addLoginHandler:^( FBDialogState state, NSString *token, NSDate *expirationDate ) {
switch (state) {
case FacebookDialogSuccess:
[((FBLoginDialog*)weakSelf).delegate facebookDialogDidLogin:token expirationDate:expirationDate];
case kFBDialogSuccess:
[((FBLoginDialog*)weakSelf).delegate kFBDialogDidLogin:token expirationDate:expirationDate];
break;

default:
[((FBLoginDialog*)weakSelf).delegate facebookbDialogDidNotLogin:(state == FacebookDialogCancelled)];
[((FBLoginDialog*)weakSelf).delegate facebookbDialogDidNotLogin:(state == kFBDialogCancelled)];
break;
}
}];
Expand Down
5 changes: 2 additions & 3 deletions src/FBLoginDialog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@
* It start pop-ups prompting for credentials and permissions.
*/

@interface FBLoginDialog : FBDialog {
}
@interface FBLoginDialog : FBDialog

- (id)initWithURL:(NSString *) loginURL
loginParams:(NSMutableDictionary *) params;

- (void)addLoginHandler:(void(^)( FacebookDialogState state, NSString *token, NSDate *expirationDate ))handler;
- (void)addLoginHandler:(void(^)( FBDialogState state, NSString *token, NSDate *expirationDate ))handler;

@end

Expand Down
14 changes: 7 additions & 7 deletions src/FBLoginDialog.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ - (void) dialogDidSucceed:(NSURL*)url {
} else {

[[self blockHandler] enumerateEventHandlers:kFBLoginBlockHandlerKey block:^(id _handler) {
void (^handler)(FacebookDialogState state, NSString *token, NSDate *date ) = _handler;
handler(FacebookDialogSuccess, token, expirationDate);
void (^handler)(FBDialogState state, NSString *token, NSDate *date ) = _handler;
handler(kFBDialogSuccess, token, expirationDate);
}];


Expand All @@ -82,8 +82,8 @@ - (void)dialogDidCancel:(NSURL *)url {
[self dismissWithSuccess:NO animated:YES];

[[self blockHandler] enumerateEventHandlers:kFBLoginBlockHandlerKey block:^(id _handler) {
void (^handler)(FacebookDialogState state, NSString *token, NSDate *date ) = _handler;
handler(FacebookDialogCancelled, nil, nil);
void (^handler)(FBDialogState state, NSString *token, NSDate *date ) = _handler;
handler(kFBDialogCancelled, nil, nil);
}];
}

Expand All @@ -93,13 +93,13 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
[super webView:webView didFailLoadWithError:error];

[[self blockHandler] enumerateEventHandlers:kFBLoginBlockHandlerKey block:^(id _handler) {
void (^handler)(FacebookDialogState state, NSString *token, NSDate *date ) = _handler;
handler(FacebookDialogFailed, nil, nil);
void (^handler)(FBDialogState state, NSString *token, NSDate *date ) = _handler;
handler(kFBDialogFailed, nil, nil);
}];
}
}

- (void)addLoginHandler:(void(^)( FacebookDialogState state, NSString *token, NSDate *expirationDate ))handler {
- (void)addLoginHandler:(void(^)( FBDialogState state, NSString *token, NSDate *expirationDate ))handler {
[[self blockHandler] registerEventHandler:kFBLoginBlockHandlerKey handler:handler];
}

Expand Down
2 changes: 1 addition & 1 deletion src/Facebook+Delegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ - (void)setDelegate:(id<FBSessionDelegate>)delegate {

if (oldDelegate) return;

[self addLoginHandler:^(Facebook *facebook, FacebookLoginState state) {
[self addLoginHandler:^(Facebook *facebook, FBLoginState state) {
switch (state) {
case kFBLoginSuccess:
[weakSelf.delegate facebookDidLogin:facebook];
Expand Down
4 changes: 2 additions & 2 deletions src/Facebook.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ typedef enum {
kFBLoginCancelled,
kFBLoginFailed,
kFBLoginRevoked
} FacebookLoginState;
} FBLoginState;

@class FBFrictionlessRequestSettings;
@protocol FBSessionDelegate;
Expand Down Expand Up @@ -146,7 +146,7 @@ typedef enum {

- (BOOL)isFrictionlessEnabledForRecipients:(NSArray*)fbids;

- (void)addLoginHandler:(void(^)(Facebook*facebook, FacebookLoginState state))handler;
- (void)addLoginHandler:(void(^)(Facebook*facebook, FBLoginState state))handler;
- (void)addExtendTokenHandler:(void(^)(Facebook *facebook, NSString *token, NSDate *expiresAt))handler;
- (void)addLogoutHandler:(void(^)(Facebook*facebook))handler;
- (void)addSessionInvalidatedHandler:(void(^)(Facebook*facebook))handler;
Expand Down
14 changes: 7 additions & 7 deletions src/Facebook.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,21 +216,21 @@ - (void)_handleLoginFailed:(BOOL)cancelled {
[self _applyLoginHandlers:(cancelled ? kFBLoginCancelled : kFBLoginFailed)];
}
- (void)_applyLoginDialogHandlers:(FBLoginDialog*)dialog {
[dialog addLoginHandler:^(FacebookDialogState state, NSString *token, NSDate *expirationDate) {
[dialog addLoginHandler:^(FBDialogState state, NSString *token, NSDate *expirationDate) {
switch (state) {
case FacebookDialogSuccess:
case kFBDialogSuccess:
[self _handleLogin:token expirationDate:expirationDate];
break;

default:
[self _handleLoginFailed:(state == FacebookDialogCancelled)];
[self _handleLoginFailed:(state == kFBDialogCancelled)];
break;
}
}];
}
- (void)_applyLoginHandlers:(FacebookLoginState)state {
- (void)_applyLoginHandlers:(FBLoginState)state {
[self enumerateEventHandlers:kFBLoginBlockHandlerKey block:^(id _handler) {
void (^handler)(Facebook*,FacebookLoginState) = _handler;
void (^handler)(Facebook*,FBLoginState) = _handler;
handler(self, state);
}];
}
Expand Down Expand Up @@ -527,7 +527,7 @@ - (void)authorize:(NSArray *)permissions
void (^grantedHandler)(Facebook*) = [_grantedHandler copy];
void (^deniedHandler)(Facebook*) = [_deniedHandler copy];

[self registerEventHandler:kFBLoginBlockHandlerKey discard:YES handler:^(Facebook *facebook, FacebookLoginState state) {
[self registerEventHandler:kFBLoginBlockHandlerKey discard:YES handler:^(Facebook *facebook, FBLoginState state) {
if( state == kFBLoginSuccess && grantedHandler ) {
NSMutableSet *new_permissions = [NSMutableSet setWithSet:_permissions];
[new_permissions addObjectsFromArray:permissions];
Expand Down Expand Up @@ -1129,7 +1129,7 @@ - (BOOL)isFrictionlessEnabledForRecipients:(NSArray*)fbids {

#pragma mark - Handlers

- (void)addLoginHandler:(void(^)(Facebook*, FacebookLoginState))handler {
- (void)addLoginHandler:(void(^)(Facebook*, FBLoginState))handler {
[self registerEventHandler:kFBLoginBlockHandlerKey handler:handler];
}
- (void)addExtendTokenHandler:(void(^)(Facebook *facebook, NSString *token, NSDate *expiresAt))handler {
Expand Down

0 comments on commit 466399f

Please sign in to comment.