Merge pull request #6205 from vishalduggal/timob-17712-34X

[TIMOB-17712] (3_4_X) iOS8: Avoid race condition on dismissal of modal window
tidev · Oct 7, 2014 · a48d448 · a48d448
2 parents f3863b9 + 932f733
commit a48d448
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/iphone/Classes/TiRootViewController.h b/iphone/Classes/TiRootViewController.h
@@ -60,6 +60,7 @@
 -(void)incrementActiveAlertControllerCount;
 -(void)decrementActiveAlertControllerCount;
 -(UIViewController*)topPresentedController;
+-(UIInterfaceOrientation) lastValidOrientation:(TiOrientationFlags)orientationFlags;
 -(void)updateStatusBar;
 @property (nonatomic, readonly) BOOL statusBarInitiallyHidden;
 @property (nonatomic, readonly) UIStatusBarStyle defaultStatusBarStyle;

diff --git a/iphone/Classes/TiRootViewController.m b/iphone/Classes/TiRootViewController.m
@@ -1015,18 +1015,19 @@ -(void)repositionSubviews
     */
 }
 
--(UIInterfaceOrientation) lastValidOrientation:(BOOL)checkModal
+-(UIInterfaceOrientation) lastValidOrientation:(TiOrientationFlags)orientationFlags
 {
-    if ([self shouldRotateToInterfaceOrientation:deviceOrientation checkModal:checkModal]) {
+    if (TI_ORIENTATION_ALLOWED(orientationFlags,deviceOrientation)) {
         return deviceOrientation;
     }
     for (int i = 0; i<4; i++) {
-		if ([self shouldRotateToInterfaceOrientation:orientationHistory[i] checkModal:checkModal]) {
-			return orientationHistory[i];
-		}
-	}
-	//This line should never happen, but just in case...
-	return UIInterfaceOrientationPortrait;
+        if (TI_ORIENTATION_ALLOWED(orientationFlags,orientationHistory[i])) {
+            return orientationHistory[i];
+        }
+    }
+
+    //This line should never happen, but just in case...
+    return UIInterfaceOrientationPortrait;
 }
 
 - (BOOL)shouldRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation checkModal:(BOOL)check
@@ -1185,7 +1186,7 @@ - (NSUInteger)supportedInterfaceOrientations{
 
 - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation
 {
-    return [self lastValidOrientation:YES];
+    return [self lastValidOrientation:[self getFlags:NO]];
 }
 
 -(void)didOrientNotify:(NSNotification *)notification
@@ -1196,7 +1197,6 @@ -(void)didOrientNotify:(NSNotification *)notification
         return;
     }
     deviceOrientation = (UIInterfaceOrientation) newOrientation;
-
     if ([self shouldRotateToInterfaceOrientation:deviceOrientation checkModal:NO]) {
         [self resetTransformAndForceLayout:YES];
         [self updateOrientationHistory:deviceOrientation];
@@ -1215,7 +1215,7 @@ -(void)refreshOrientationWithDuration:(id)unused
         return;
     }
 
-    UIInterfaceOrientation target = [self lastValidOrientation:NO];
+    UIInterfaceOrientation target = [self lastValidOrientation:[self getFlags:NO]];
     //Device Orientation takes precedence.
     if (target != deviceOrientation) {
         if ([self shouldRotateToInterfaceOrientation:deviceOrientation checkModal:NO]) {
@@ -1541,7 +1541,7 @@ -(void)viewDidAppear:(BOOL)animated
         for (id<TiWindowProtocol> thisWindow in containedWindows) {
             [thisWindow viewDidAppear:animated];
         }
-        if (forcingRotation) {
+        if (forcingRotation || [TiUtils isIOS8OrGreater]) {
             forcingRotation = NO;
             [self performSelector:@selector(childOrientationControllerChangedFlags:) withObject:[containedWindows lastObject] afterDelay:[[UIApplication sharedApplication] statusBarOrientationAnimationDuration]];
         } else {

diff --git a/iphone/Classes/TiViewController.m b/iphone/Classes/TiViewController.m
@@ -102,7 +102,7 @@ - (NSUInteger)supportedInterfaceOrientations {
 
 - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation
 {
-    return [[[TiApp app] controller] preferredInterfaceOrientationForPresentation];
+    return [[[TiApp app] controller] lastValidOrientation:_supportedOrientations];
 }
 
 -(void)loadView