Passing presenting view controller to RSTwitterEngine

MugunthKumar · Mar 14, 2012 · 74ae1a6 · 74ae1a6
1 parent b0e80aa
commit 74ae1a6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/TwitterDemo/Twitter/RSTwitterEngine.h b/TwitterDemo/Twitter/RSTwitterEngine.h
@@ -37,6 +37,8 @@ typedef void (^RSTwitterEngineStatusChangeHandler)(NSString *newStatus);
 }
 
 @property (nonatomic, copy) RSTwitterEngineStatusChangeHandler statusChangeHandler;
+@property (assign, nonatomic) UIViewController *presentingViewController;
+
 @property (readonly) NSString *screenName;
 
 - (id)initWithStatusChangedHandler:(RSTwitterEngineStatusChangeHandler) handler;

diff --git a/TwitterDemo/Twitter/RSTwitterEngine.m b/TwitterDemo/Twitter/RSTwitterEngine.m
@@ -49,6 +49,7 @@ @implementation RSTwitterEngine
 
 @synthesize webController = _webController;
 @synthesize statusChangeHandler = _statusChangeHandler;
+@synthesize presentingViewController = _presentingViewController;
 
 #pragma mark - Read-only Properties
 
@@ -304,21 +305,22 @@ -(void) openURL:(NSURL*) url {
 
   self.webController = [[WebViewController alloc] initWithURL:url];  
   self.webController.callbackURL = TW_CALLBACK_URL;
-  UIViewController *presentingViewController = [[[UIApplication sharedApplication] windows] objectAtIndex:0]; 
-  [presentingViewController presentModalViewController:self.webController animated:YES];
+
+  [self.presentingViewController presentModalViewController:self.webController animated:YES];
 
   __unsafe_unretained RSTwitterEngine *weakSelf = self; 
 
   self.webController.authenticationCanceledHandler = ^{
 
     __strong RSTwitterEngine *strongSelf = weakSelf; 
-    [presentingViewController dismissModalViewControllerAnimated:YES];
+    [strongSelf.presentingViewController dismissModalViewControllerAnimated:YES];
     [strongSelf cancelAuthentication];
   };
 
   self.webController.authenticationCompletedHandler = ^(NSURL* url) {
 
     __strong RSTwitterEngine *strongSelf = weakSelf; 
+    [strongSelf.presentingViewController dismissModalViewControllerAnimated:YES];
     [strongSelf resumeAuthenticationFlowWithURL:url];
   };
 }

diff --git a/TwitterDemo/ViewController.m b/TwitterDemo/ViewController.m
@@ -48,6 +48,7 @@ - (void)viewDidLoad
       self.statusLabel.text = newStatus;
     }];
 
+    self.twitterEngine.presentingViewController = self;
     // A right swipe on the status label will clear the stored token
     UISwipeGestureRecognizer *swipeRight = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipedRight:)];
     swipeRight.direction = UISwipeGestureRecognizerDirectionRight;