Merge pull request #6065 from vishalduggal/timob-17648

[TIMOB-17648] iOS8: iPad Alert dialog does not consider window orientation modes
tidev · Sep 12, 2014 · b3d1a5b · b3d1a5b
2 parents 57cf553 + 157d145
commit b3d1a5b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/iphone/Classes/TiRootViewController.h b/iphone/Classes/TiRootViewController.h
@@ -49,13 +49,16 @@
 
     BOOL statusBarIsHidden;
     BOOL statusBarVisibilityChanged;
+    NSInteger activeAlertControllerCount;
 }
 
 //Titanium Support
 -(CGRect)resizeView;
 -(void)repositionSubviews;
 -(UIView *)topWindowProxyView;
 -(NSUInteger)supportedOrientationsForAppDelegate;
+-(void)incrementActiveAlertControllerCount;
+-(void)decrementActiveAlertControllerCount;
 -(void)updateStatusBar;
 @property (nonatomic, readonly) BOOL statusBarInitiallyHidden;
 @property (nonatomic, readonly) UIStatusBarStyle defaultStatusBarStyle;

diff --git a/iphone/Classes/TiRootViewController.m b/iphone/Classes/TiRootViewController.m
@@ -916,12 +916,17 @@ -(TiOrientationFlags)getDefaultOrientations
 	return defaultOrientations;
 }
 
--(UIViewController*)topPresentedController
+-(UIViewController*)topPresentedControllerCheckingPopover:(BOOL)checkPopover
 {
     UIViewController* topmostController = self;
     UIViewController* presentedViewController = nil;
     while ( topmostController != nil ) {
         presentedViewController = [topmostController presentedViewController];
+        if (checkPopover && [TiUtils isIOS8OrGreater]) {
+            if (presentedViewController.modalPresentationStyle == UIModalPresentationPopover) {
+                presentedViewController = nil;
+            }
+        }
         if (presentedViewController != nil) {
             topmostController = presentedViewController;
             presentedViewController = nil;
@@ -933,6 +938,11 @@ -(UIViewController*)topPresentedController
     return topmostController;
 }
 
+-(UIViewController*)topPresentedController
+{
+    return [self topPresentedControllerCheckingPopover:NO];
+}
+
 -(UIViewController<TiControllerContainment>*)topContainerController;
 {
     UIViewController* topmostController = self;
@@ -1098,11 +1108,25 @@ - (BOOL)shouldAutorotate{
     return YES;
 }
 
+-(void)incrementActiveAlertControllerCount
+{
+    ++activeAlertControllerCount;
+}
+-(void)decrementActiveAlertControllerCount
+{
+    --activeAlertControllerCount;
+}
+
 -(NSUInteger)supportedOrientationsForAppDelegate;
 {
     if (forcingStatusBarOrientation) {
         return 0;
     }
+
+    if ([TiUtils isIOS8OrGreater] && activeAlertControllerCount > 0) {
+        return [self supportedInterfaceOrientations];
+    }
+
     //Since this is used just for intersection, ok to return UIInterfaceOrientationMaskAll
     return 30;//UIInterfaceOrientationMaskAll
 }
@@ -1114,7 +1138,7 @@ - (NSUInteger)supportedInterfaceOrientations{
     }
     //IOS6. If we are presenting a modal view controller, get the supported
     //orientations from the modal view controller
-    UIViewController* topmostController = [self topPresentedController];
+    UIViewController* topmostController = [self topPresentedControllerCheckingPopover:YES];
     if (topmostController != self) {
         NSUInteger retVal = [topmostController supportedInterfaceOrientations];
         if ([topmostController isBeingDismissed]) {

diff --git a/iphone/Classes/TiUIAlertDialogProxy.m b/iphone/Classes/TiUIAlertDialogProxy.m
@@ -7,6 +7,7 @@
 
 #import "TiUIAlertDialogProxy.h"
 #import "TiUtils.h"
+#import "TiApp.h"
 
 static NSCondition* alertCondition;
 static BOOL alertShowing = NO;
@@ -53,6 +54,7 @@ -(void) cleanup
 		[self forgetSelf];
 		[self autorelease];
 		RELEASE_TO_NIL(alert);
+		[[[TiApp app] controller] decrementActiveAlertControllerCount];
 		[[NSNotificationCenter defaultCenter] removeObserver:self];
 	}
 }
@@ -131,6 +133,7 @@ -(void)show:(id)args
 		[alert setAlertViewStyle:style];
 
 		[self retain];
+		[[[TiApp app] controller] incrementActiveAlertControllerCount];
 		[alert show];
 	}
 }

diff --git a/iphone/Classes/TiUIOptionDialogProxy.m b/iphone/Classes/TiUIOptionDialogProxy.m
@@ -70,6 +70,7 @@ -(void)show:(id)args
 	[actionSheet setDestructiveButtonIndex:[TiUtils intValue:[self valueForKey:@"destructive"] def:-1]];
 
 	[self retain];
+	[[[TiApp app] controller] incrementActiveAlertControllerCount];
 
 	if ([TiUtils isIPad])
 	{
@@ -104,6 +105,7 @@ -(void)completeWithButton:(int)buttonIndex
                                    nil];
             [self fireEvent:@"click" withObject:event];
         }
+        [[[TiApp app] controller] decrementActiveAlertControllerCount];
         [[NSNotificationCenter defaultCenter] removeObserver:self];
         [self forgetSelf];
         [self release];