Merge pull request #3064 from vishalduggal/timob-11187

[TIMOB-11187] Adview crash
tidev · Sep 27, 2012 · 5d21b74 · 5d21b74
2 parents c787cd4 + 45d9039
commit 5d21b74
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 6 deletions.
diff --git a/iphone/Classes/TiRootViewController.m b/iphone/Classes/TiRootViewController.m
@@ -320,6 +320,20 @@ - (void) viewDidDisappear:(BOOL)animated
 
 - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation
 {
+    //IOS6. If we are presenting a modal view controller, get the preferred
+    //presentation orientation from the modal view controller
+    id<TiUIViewControllerIOS6Support> topmostController = [self topmostViewController];
+    if (topmostController != self) {
+        //If I am a modal window then send out orientationFlags property
+        if ([topmostController isKindOfClass:[UINavigationController class]]) {
+            UIViewController* topVC = [(UINavigationController *)topmostController topViewController];
+            if ( topVC != nil && ([topVC isKindOfClass:[TiViewController class]]) ) {
+                return [self lastValidOrientation];
+            }
+        }
+        //Send out whatever the View Controller supports
+        return [topmostController preferredInterfaceOrientationForPresentation];
+    }
     return [self lastValidOrientation];
 }
 

diff --git a/iphone/Classes/TiUIiOSAdView.h b/iphone/Classes/TiUIiOSAdView.h
@@ -8,6 +8,7 @@
 
 #ifdef USE_TI_UIIOSADVIEW
 
+#import "TiUIiOSAdViewProxy.h"
 #import <iAd/iAd.h>
 
 @interface TiUIiOSAdView : TiUIView<ADBannerViewDelegate> {

diff --git a/iphone/Classes/TiUIiOSAdView.m b/iphone/Classes/TiUIiOSAdView.m
@@ -81,11 +81,7 @@ - (void)bannerViewDidLoadAd:(ADBannerView *)banner
 		WARN_IF_BACKGROUND_THREAD_OBJ;	//NSNotificationCenter is not threadsafe!
 		[[NSNotificationCenter defaultCenter] postNotificationName:kTiAnalyticsNotification object:nil userInfo:event]; 
 	}
-	if ([self.proxy _hasListeners:@"load"])
-	{
-		NSMutableDictionary *event = [NSMutableDictionary dictionary];
-		[self.proxy fireEvent:@"load" withObject:event];
-	}
+	[(TiUIiOSAdViewProxy*) self.proxy fireLoad:nil];
 }
 
 - (void)bannerViewActionDidFinish:(ADBannerView *)banner

diff --git a/iphone/Classes/TiUIiOSAdViewProxy.h b/iphone/Classes/TiUIiOSAdViewProxy.h
@@ -18,7 +18,8 @@
 // must be class-available rather than instance-available
 +(NSString*)portraitSize;
 +(NSString*)landscapeSize;
-
+#pragma mark internal
+-(void)fireLoad:(id)unused;
 @end
 
 #endif
diff --git a/iphone/Classes/TiUIiOSAdViewProxy.m b/iphone/Classes/TiUIiOSAdViewProxy.m
@@ -31,6 +31,15 @@ +(NSString*)landscapeSize
 	return @"ADBannerContentSize480x32";
 }
 
+-(TiDimension)defaultAutoWidthBehavior:(id)unused
+{
+    return TiDimensionAutoSize;
+}
+-(TiDimension)defaultAutoHeightBehavior:(id)unused
+{
+    return TiDimensionAutoSize;
+}
+
 USE_VIEW_FOR_CONTENT_HEIGHT
 USE_VIEW_FOR_CONTENT_WIDTH
 
@@ -66,6 +75,17 @@ -(void)setAdSize:(id)arg
     [self makeViewPerformSelector:@selector(setAdSize:) withObject:arg createIfNeeded:YES waitUntilDone:NO];
 }
 
+-(void)fireLoad:(id)unused
+{
+    if ([self _hasListeners:@"load"])
+    {
+        NSMutableDictionary *event = [NSMutableDictionary dictionary];
+        [self fireEvent:@"load" withObject:event];
+    }
+
+    [self contentsWillChange];
+}
+
 @end
 
 #endif