MS-531 MRAID video does not launch correctly

Added displayController to protocol for presenting playVideo
appnexus · Feb 6, 2014 · 72aa3b0 · 72aa3b0
1 parent 0251fdf
commit 72aa3b0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 36 deletions.
diff --git a/sdk/internal/ANAdView.m b/sdk/internal/ANAdView.m
@@ -66,6 +66,7 @@ @implementation ANAdView
 
 // MRAIDAdViewDelegate methods
 - (NSString *)adType { return nil; }
+- (UIViewController *)displayController { return nil; }
 - (void)adShouldResetToDefault {}
 - (void)adShouldExpandToFrame:(CGRect)frame closeButton:(UIButton *)closeButton {}
 - (void)adShouldResizeToFrame:(CGRect)frame allowOffscreen:(BOOL)allowOffscreen
@@ -189,16 +190,6 @@ - (void)mraidExpandAd:(CGSize)size
 
     [self adWillPresent];
 
-    // set presenting controller for MRAID WebViewController
-    ANMRAIDAdWebViewController *mraidWebViewController;
-    if ([contentView isKindOfClass:[UIWebView class]]) {
-        UIWebView *webView = (UIWebView *)contentView;
-        if ([webView.delegate isKindOfClass:[ANMRAIDAdWebViewController class]]) {
-            mraidWebViewController = (ANMRAIDAdWebViewController *)webView.delegate;
-            mraidWebViewController.controller = rootViewController;
-        }
-    }
-
     // set default frames for resetting later
     if (CGRectIsNull(self.defaultFrame)) {
         self.defaultParentFrame = defaultParentView.frame;
@@ -217,14 +208,6 @@ - (void)mraidExpandAd:(CGSize)size
 
         self.mraidController.contentView = contentView;
         [self.mraidController.view addSubview:contentView];
-        // set presenting controller for MRAID WebViewController
-        if ([contentView isKindOfClass:[UIWebView class]]) {
-            UIWebView *webView = (UIWebView *)contentView;
-            if ([webView.delegate isKindOfClass:[ANMRAIDAdWebViewController class]]) {
-                ANMRAIDAdWebViewController *webViewController = (ANMRAIDAdWebViewController *)webView.delegate;
-                webViewController.controller = self.mraidController;
-            }
-        }
 
         [rootViewController presentViewController:self.mraidController animated:NO completion:^{
             [self adDidPresent];
@@ -281,16 +264,6 @@ - (NSString *)mraidResizeAd:(CGRect)frame
     NSString *mraidResizeErrorString = [self isResizeValid:contentView frameToResizeTo:frame];
     if ([mraidResizeErrorString length] > 0) return mraidResizeErrorString;
 
-    // set presenting controller for MRAID WebViewController
-    ANMRAIDAdWebViewController *mraidWebViewController;
-    if ([contentView isKindOfClass:[UIWebView class]]) {
-        UIWebView *webView = (UIWebView *)contentView;
-        if ([webView.delegate isKindOfClass:[ANMRAIDAdWebViewController class]]) {
-            mraidWebViewController = (ANMRAIDAdWebViewController *)webView.delegate;
-            mraidWebViewController.controller = rootViewController;
-        }
-    }
-
     // set default frames for resetting later
     if (CGRectIsNull(self.defaultFrame)) {
         self.defaultParentFrame = defaultParentView.frame;

diff --git a/sdk/internal/ANAdWebViewController.h b/sdk/internal/ANAdWebViewController.h
@@ -30,5 +30,5 @@
 @interface ANMRAIDAdWebViewController : ANAdWebViewController <ANMRAIDEventReceiver>
 
 @property (nonatomic, readwrite, weak) id<ANMRAIDAdViewDelegate> mraidDelegate;
-@property (nonatomic, readwrite, weak) UIViewController *controller;
+
 @end
diff --git a/sdk/internal/ANAdWebViewController.m b/sdk/internal/ANAdWebViewController.m
@@ -170,12 +170,7 @@ - (void)dealloc {
     if (self.viewabilityTimer) {
         [self.viewabilityTimer invalidate];
     }
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:UIApplicationDidEnterBackgroundNotification
-                                                  object:[UIApplication sharedApplication]];
-    [[NSNotificationCenter defaultCenter] removeObserver:self
-                                                    name:UIApplicationDidChangeStatusBarOrientationNotification
-                                                  object:[UIApplication sharedApplication]];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 - (BOOL)getWebViewVisible {    
@@ -455,7 +450,7 @@ - (void)playVideo:(NSDictionary *)queryComponents {
                                                object:moviePlayerViewController.moviePlayer];
 
     [moviePlayerViewController.moviePlayer prepareToPlay];
-    [self.controller presentMoviePlayerViewControllerAnimated:moviePlayerViewController];
+    [[self.mraidDelegate displayController] presentMoviePlayerViewControllerAnimated:moviePlayerViewController];
     [moviePlayerViewController.moviePlayer play];
 }
 

diff --git a/sdk/internal/ANBannerAdView.m b/sdk/internal/ANBannerAdView.m
@@ -269,6 +269,10 @@ - (NSString *)adType {
     return @"inline";
 }
 
+- (UIViewController *)displayController {
+    return self.mraidController ? self.mraidController : self.rootViewController;
+}
+
 - (void)adShouldExpandToFrame:(CGRect)frame
                   closeButton:(UIButton *)closeButton {
     [super mraidExpandAd:frame.size

diff --git a/sdk/internal/ANInterstitialAd.m b/sdk/internal/ANInterstitialAd.m
@@ -303,6 +303,10 @@ - (NSString *)adType {
 	return @"interstitial";
 }
 
+- (UIViewController *)displayController {
+    return self.mraidController ? self.mraidController : self.controller;
+}
+
 - (void)adShouldExpandToFrame:(CGRect)frame
                   closeButton:(UIButton *)closeButton {
     [super mraidExpandAd:frame.size

diff --git a/sdk/internal/ANMRAIDProperties.h b/sdk/internal/ANMRAIDProperties.h
@@ -63,6 +63,7 @@ typedef enum _ANMRAIDState
 @property (nonatomic, readwrite, weak) id<ANMRAIDEventReceiver> mraidEventReceiverDelegate;
 
 - (NSString *)adType;
+- (UIViewController *)displayController;
 - (void)adShouldResetToDefault;
 - (void)adShouldExpandToFrame:(CGRect)frame closeButton:(UIButton *)closeButton;
 - (void)adShouldResizeToFrame:(CGRect)frame allowOffscreen:(BOOL)allowOffscreen