Pull request #896: SDK v8.7.0

Merge in MOBILE-SDK/app_mobile-sdk-ios from SDKv8.7.0 to master

* commit '251c124917bf655417289d3916727f3e94fdf0db':
  updated release notes
  Updated version 8.7.0
  Pull request #893: MS-5346 Fixed issue when Multiple Banner native rendering ad loading - loads only the last ad
  Pull request #894: MS-5206 Changes for video orientation - iOS
  MS-5344 Outlook reports crashes in prod environment with the SDK updated to 8.2
  MS-5340 module map build fixes

AppNexusSDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "AppNexusSDK"
-  s.version      = "8.6.0"
+  s.version      = "8.7.0"
   s.platform     = :ios, "10.0"
 
   s.summary      = "AppNexus iOS Mobile Advertising SDK"

RELEASE-NOTES.md

@@ -1,3 +1,11 @@
+## 8.7.0
+
+### Improvement/Bug Fixes
++ MS-5346 Fixed issue where only last ad is rendered in a multi ad request for Banner Native Rendering
++ MS-5206 Added support for setting player size and getting video creative width and height for BannerVideo. New API introduced in ANBannerAdView landscapeBannerVideoPlayerSize, portraitBannerVideoPlayerSize, squareBannerVideoPlayerSize , getVideoWidth, getVideoHeight and In ANVideoAdPlayer getVideoWidth and getVideoHeight
++ MS-5344 Gracefully handle error to avoid crash during fetch User agent String
++ MS-5340 Fixed ModuleMap XCFramework Warning
+
 ## 8.6.0
 
 ### Improvement/Bug Fixes

sdk/AppNexusNativeSDK/SDK-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>8.7.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

sdk/AppNexusSDK/SDK-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>8.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

sdk/sourcefiles/internal/ANAdFetcher.h

@@ -93,6 +93,10 @@
 //   setVideoAdOrientation is sufficient to BannerAd entry point.
 -(void)setVideoAdOrientation:(ANVideoOrientation)videoOrientation;
 
+-(void)setVideoAdWidth:(NSInteger)videoAdWidth;
+
+-(void)setVideoAdHeight:(NSInteger)videoAdHeight;
+
 @end
 
 

sdk/sourcefiles/internal/ANAdFetcher.m

@@ -482,6 +482,18 @@ - (void) didCompleteFirstLoadFromWebViewController:(ANAdWebViewController *)cont
                 [self.delegate setVideoAdOrientation:controller.videoAdOrientation];
             }
         }
+
+        if (controller.videoAdWidth) {
+            if ([self.delegate respondsToSelector:@selector(setVideoAdWidth:)]) {
+                [self.delegate setVideoAdWidth:controller.videoAdWidth];
+            }
+        }
+
+        if (controller.videoAdHeight) {
+            if ([self.delegate respondsToSelector:@selector(setVideoAdHeight:)]) {
+                [self.delegate setVideoAdHeight:controller.videoAdHeight];
+            }
+        }
 
         fetcherResponse = [ANAdFetcherResponse responseWithAdObject: self.adView
                                                  andAdObjectHandler: self.adObjectHandler ];

sdk/sourcefiles/internal/ANAdViewInternalDelegate.h

@@ -66,6 +66,9 @@
 @protocol ANBannerAdViewInternalDelegate <ANAdViewInternalDelegate>
 
 - (NSNumber *)transitionInProgress;
+- (CGSize) landscapeBannerVideoPlayerSize;
+- (CGSize) portraitBannerVideoPlayerSize;
+- (CGSize) squareBannerVideoPlayerSize;
 
 @end
 

sdk/sourcefiles/internal/ANAdWebViewController.h

@@ -50,6 +50,9 @@
 
 @property (nonatomic, readwrite, assign)  NSTimeInterval  checkViewableTimeInterval;
 @property (nonatomic, readonly, assign)  ANVideoOrientation  videoAdOrientation;
+@property (nonatomic, readonly, assign)  NSInteger  videoAdWidth;
+@property (nonatomic, readonly, assign)  NSInteger  videoAdHeight;
+@property (nonatomic, readwrite, assign) CGSize videoPlayerSize;
 
 
 - (instancetype)initWithSize:(CGSize)size

sdk/sourcefiles/internal/ANAdWebViewController.m

@@ -72,7 +72,8 @@ @interface ANAdWebViewController () <WKNavigationDelegate, WKUIDelegate, WKScrip
 @property (nonatomic, readwrite, strong)  NSString  *videoXML;
 @property (nonatomic, readwrite)          BOOL       appIsInBackground;
 @property (nonatomic, readwrite, assign)  ANVideoOrientation  videoAdOrientation;
-
+@property (nonatomic, readwrite, assign)  NSInteger  videoAdWidth;
+@property (nonatomic, readwrite, assign)  NSInteger  videoAdHeight;
 @property (nonatomic, readwrite, strong)  ANAudioVolumeChangeListener* audioVolumeChange;
 
 @end
@@ -192,6 +193,7 @@ - (instancetype) initWithSize: (CGSize)size
 
     _webView = [[ANWebView alloc] initWithSize:size URL:[[[ANSDKSettings sharedInstance] baseUrlConfig] videoWebViewUrl] isVASTVideoAd:true];
     self.firstNavigation = _webView.navigation;
+    self.videoPlayerSize = size;
     [self loadWebViewWithUserScripts];
 
     UIWindow  *currentWindow  = [ANGlobal getKeyWindow];
@@ -449,6 +451,8 @@ - (void) userContentController: (WKUserContentController *)userContentController
         if(paramsDictionary.count > 0){
             self.videoAdOrientation = [ANGlobal parseVideoOrientation:[paramsDictionary objectForKey:kANAspectRatio]];
         }
+        self.videoAdWidth = [[paramsDictionary objectForKey:@"width"] integerValue];
+        self.videoAdHeight = [[paramsDictionary objectForKey:@"height"] integerValue];
         // For VideoAds's wait unitll adReady to create AdSession if not the adsession will run in limited access mode.
         self.omidAdSession = [[ANOMIDImplementation sharedInstance] createOMIDAdSessionforWebView:self.webView isVideoAd:true];
         if ([self.videoDelegate respondsToSelector:@selector(videoAdReady)]) {

sdk/sourcefiles/internal/ANBannerAdView.m

@@ -72,6 +72,10 @@ @interface ANBannerAdView() <ANBannerAdViewInternalDelegate, ANRealTimerDelegate
 
 @property (nonatomic, readwrite, assign)  ANVideoOrientation  videoAdOrientation;
 
+@property (nonatomic, readwrite, assign)  NSInteger  videoAdWidth;
+
+@property (nonatomic, readwrite, assign)  NSInteger  videoAdHeight;
+
 @property (nonatomic, readwrite, assign) ANImpressionType impressionType;
 
 /**
@@ -113,8 +117,10 @@ @implementation ANBannerAdView
 @synthesize  adResponseInfo                 = _adResponseInfo;
 @synthesize  minDuration                    = __minDuration;
 @synthesize  maxDuration                    = __maxDuration;
-
 @synthesize  enableLazyLoad                 = _enableLazyLoad;
+@synthesize  landscapeBannerVideoPlayerSize                 = _landscapeBannerVideoPlayerSize;
+@synthesize  portraitBannerVideoPlayerSize                 = _portraitBannerVideoPlayerSize;
+@synthesize  squareBannerVideoPlayerSize                 = _squareBannerVideoPlayerSize;
 
 
 #pragma mark - Lifecycle.
@@ -139,6 +145,11 @@ - (void)initialize {
 
     _nativeAdRendererId           = 0;
     _videoAdOrientation           = ANUnknown;
+    _videoAdWidth                 = 0;
+    _videoAdHeight                = 0;
+    _landscapeBannerVideoPlayerSize = CGSizeMake(1, 1);
+    _portraitBannerVideoPlayerSize = CGSizeMake(1, 1);
+    _squareBannerVideoPlayerSize = CGSizeMake(1, 1);
 
     self.allowSmallerSizes        = NO;
     self.loadAdHasBeenInvoked     = NO;
@@ -271,6 +282,22 @@ - (ANVideoOrientation) getVideoOrientation {
     return _videoAdOrientation;
 }
 
+-(void)setVideoAdWidth:(NSInteger)videoWidth{
+    _videoAdWidth = videoWidth;
+}
+
+- (NSInteger) getVideoWidth {
+    return _videoAdWidth;
+}
+
+-(void)setVideoAdHeight:(NSInteger)videoHeight{
+    _videoAdHeight = videoHeight;
+}
+
+- (NSInteger) getVideoHeight {
+    return _videoAdHeight;
+}
+
 - (CGSize)adSize {
     ANLogDebug(@"adSize returned %@", NSStringFromCGSize(_adSize));
     return  _adSize;
@@ -660,6 +687,16 @@ - (void)adFetcher:(ANAdFetcher *)fetcher didFinishRequestWithResponse:(ANAdFetch
         if(self.contentView == nil){
             self.contentView = adObject;
         }
+
+        // Once the contentView is set Video will resize based on user set size(landscape/portrait/squareBannerVideoPlayerSize),
+        // we need to update the loaded Ad Size
+        if ((_adResponseInfo.adType == ANAdTypeVideo))
+        {
+            if([self.contentView isKindOfClass:[ANMRAIDContainerView class]]){
+                ANMRAIDContainerView *adView = (ANMRAIDContainerView *)self.contentView;
+                _loadedAdSize = adView.webViewController.videoPlayerSize;
+            }
+        }
 
         // Only Fire OMID Impression here for Begin to Render Cases. If it is Begin To Render then impression would have already fired from [ANAdFetcher fireImpressionTrackersEarly]
         if(self.impressionType == ANBeginToRender){

sdk/sourcefiles/internal/ANGlobal.h

@@ -29,9 +29,9 @@
 
 
 #if !APPNEXUS_NATIVE_MACOS_SDK
-    #define AN_SDK_VERSION                  @"8.6.0"
+    #define AN_SDK_VERSION                  @"8.7.0"
 #else
-    #define AN_SDK_VERSION                  @"8.6.0-mac"
+    #define AN_SDK_VERSION                  @"8.7.0-mac"
 #endif
 
 

sdk/sourcefiles/internal/ANGlobal.m

@@ -537,23 +537,29 @@ + (void) getUserAgent
 
             dispatch_async(dispatch_get_main_queue(),
                            ^{
-                webViewForUserAgent  = [WKWebView new];
-                [webViewForUserAgent evaluateJavaScript: @"navigator.userAgent"
-                                      completionHandler: ^(id __nullable userAgentString, NSError * __nullable error)
-                 {
-                    if (error != nil) {
-                        [[NSNotificationCenter defaultCenter] postNotificationName:@"kUserAgentFailedToChangeNotification" object:nil userInfo:nil];
-                        ANLogError(@"%@ error: %@", NSStringFromSelector(_cmd), error);
-                    } else if ([userAgentString isKindOfClass:NSString.class]) {
-                        ANLogDebug(@"userAgentString=%@", userAgentString);
-                        anUserAgent = userAgentString;
-                        [[NSNotificationCenter defaultCenter] postNotificationName:@"kUserAgentDidChangeNotification" object:nil userInfo:nil];
-                        @synchronized (self) {
-                            userAgentQueryIsActive = NO;
+                @try {
+                    webViewForUserAgent  = [[WKWebView alloc] initWithFrame:CGRectZero];;
+                    [webViewForUserAgent evaluateJavaScript: @"navigator.userAgent"
+                                          completionHandler: ^(id __nullable userAgentString, NSError * __nullable error)
+                     {
+                        if (error != nil) {
+                            [[NSNotificationCenter defaultCenter] postNotificationName:@"kUserAgentFailedToChangeNotification" object:nil userInfo:nil];
+                            ANLogError(@"%@ error: %@", NSStringFromSelector(_cmd), error);
+                        } else if ([userAgentString isKindOfClass:NSString.class]) {
+                            ANLogDebug(@"userAgentString=%@", userAgentString);
+                            anUserAgent = userAgentString;
+                            [[NSNotificationCenter defaultCenter] postNotificationName:@"kUserAgentDidChangeNotification" object:nil userInfo:nil];
+                            @synchronized (self) {
+                                userAgentQueryIsActive = NO;
+                            }
                         }
-                    }
-                    webViewForUserAgent = nil;
-                }];
+                        webViewForUserAgent = nil;
+                    }];
+                }
+                @catch (NSException *exception) {
+                    ANLogError(@"Failed to fetch UserAgent with exception  (%@)", exception);
+                }
+
             });
         }
         ANLogDebug(@"userAgent=%@", anUserAgent);

sdk/sourcefiles/internal/ANWebView.h

@@ -29,6 +29,11 @@
 
     -(instancetype) initWithSize:(CGSize)size URL:(NSURL *)URL;
     -(instancetype) initWithSize:(CGSize)size URL:(NSURL *)URL isVASTVideoAd:(BOOL)videoAd;
+    -(instancetype) initWithSize:(CGSize)size
+                         content:(NSString *)htmlContent
+                         baseURL:(NSURL *)baseURL
+             isNativeRenderingAd:(BOOL)nativeRenderingAd;
+
 
  -(void) loadWithSize:(CGSize)size content:(NSString *) contentString baseURL:(NSURL *)baseURL;
 

sdk/sourcefiles/internal/ANWebView.m

@@ -33,6 +33,7 @@
 
 @interface ANWebView ()
 @property (nonatomic, readwrite, assign)  BOOL          isVASTVideoAd;
+@property (nonatomic, readwrite, assign)  BOOL          isNativeRenderingAd;
 @end
 
 
@@ -42,7 +43,7 @@ -(instancetype) initWithSize:(CGSize)size
     {
         [[self class] loadWebViewConfigurations];
         WKWebViewConfiguration *configuration;
-        if(self.isVASTVideoAd){
+        if(self.isVASTVideoAd || self.isNativeRenderingAd){
             configuration = [[self class] prepareWebConfiguration];
         }else{
             configuration = [[self class] webConfiguration];
@@ -100,6 +101,13 @@ -(instancetype) initWithSize:(CGSize)size content:(NSString *)htmlContent baseUR
         [self loadHTMLString:htmlContent baseURL:baseURL];
         return self;
     }
+
+    -(instancetype) initWithSize:(CGSize)size content:(NSString *)htmlContent baseURL:(NSURL *)baseURL isNativeRenderingAd:(BOOL)nativeRenderingAd
+    {
+        self.isNativeRenderingAd = nativeRenderingAd;
+        return [self initWithSize:size content:htmlContent baseURL:baseURL];
+
+    }
 
     -(instancetype) initWithSize:(CGSize)size URL:(NSURL *)URL isVASTVideoAd:(BOOL)videoAd {
         self.isVASTVideoAd  = videoAd;

sdk/sourcefiles/internal/MRAID/ANMRAIDContainerView.m

@@ -215,6 +215,38 @@ - (void)setAdViewDelegate:(id<ANAdViewInternalDelegate>)adViewDelegate
             [self addSupplementaryCustomCloseRegion];
         }
     }
+
+
+    if ([_adViewDelegate conformsToProtocol:@protocol(ANBannerAdViewInternalDelegate)])
+    {
+        id<ANBannerAdViewInternalDelegate>  bannerDelegate  = (id<ANBannerAdViewInternalDelegate>)_adViewDelegate;
+
+        UIView  *contentView = self.webViewController.contentView;
+        CGSize   newPlayerSize    = kANAdSize1x1;
+        switch (self.webViewController.videoAdOrientation){
+            case ANPortrait:
+                newPlayerSize = bannerDelegate.portraitBannerVideoPlayerSize;
+                break;
+            case ANSquare:
+                newPlayerSize = bannerDelegate.squareBannerVideoPlayerSize;
+                break;
+            case ANLandscape:
+            case ANUnknown:
+                newPlayerSize = bannerDelegate.landscapeBannerVideoPlayerSize;
+                break;
+        }
+
+        if (!CGSizeEqualToSize(newPlayerSize, CGSizeMake(1, 1))) {
+            self.webViewController.videoPlayerSize = newPlayerSize;
+            CGRect  updatedRect  = CGRectMake(0, 0, newPlayerSize.width, newPlayerSize.height);
+            [self setFrame:updatedRect];
+
+            contentView.translatesAutoresizingMaskIntoConstraints = NO;
+            [contentView an_constrainToSizeOfSuperview];
+            [contentView an_alignToSuperviewWithXAttribute:NSLayoutAttributeLeft
+                                                                       yAttribute:NSLayoutAttributeTop];
+        }
+    }
 }
 
 - (void)setAdInteractionInProgress:(BOOL)adInteractionInProgress {

sdk/sourcefiles/native/internal/NativeRendering/ANNativeRenderingViewController.m

@@ -93,9 +93,9 @@ - (void)initANWebViewWithSize:(CGSize)size
         base = [NSURL URLWithString:[[[ANSDKSettings sharedInstance] baseUrlConfig] webViewBaseUrl]];
     }
 
-    _webView = [ANWebView fetchWebView];
+    _webView = [[ANWebView alloc] initWithSize:size content:html baseURL:base isNativeRenderingAd:YES];
 
-    [_webView loadWithSize:size content:html baseURL:base];
+   // [_webView loadWithSize:size content:html baseURL:base];
 
     [self configureWebView];
 }

sdk/sourcefiles/public-headers/ANAdProtocol.h

@@ -282,6 +282,12 @@ Set the trafficSourceCode,  Specifies the third-party source of the impression.
  * @return Default VideoOrientation value ANUnknown, which indicates that aspectRatio can't be retrieved for the video.
  */
 - (ANVideoOrientation) getVideoOrientation;
+
+- (NSInteger) getVideoWidth;
+
+- (NSInteger) getVideoHeight;
+
+
 @end
 
 

sdk/sourcefiles/public-headers/ANBannerAdView.h

@@ -225,6 +225,12 @@ typedef NS_ENUM(NSUInteger, ANBannerViewAdAlignment) {
  */
 @property (nonatomic, readwrite) BOOL shouldAllowVideoDemand;
 
+@property (nonatomic, readwrite, assign) CGSize landscapeBannerVideoPlayerSize;
+
+@property (nonatomic, readwrite, assign) CGSize portraitBannerVideoPlayerSize;
+
+@property (nonatomic, readwrite, assign) CGSize squareBannerVideoPlayerSize;
+
 /**
  * Sets whether or not Native Ads(AppNexus Media Type:12) can serve on this Ad object.
  *

sdk/sourcefiles/video/ANVideoAdPlayer.h

@@ -101,5 +101,9 @@ typedef NS_ENUM(NSUInteger, ANVideoAdPlayerEvent) {
  */
 - (ANVideoOrientation) getVideoOrientation;
 
+- (NSInteger) getVideoWidth;
+
+- (NSInteger) getVideoHeight;
+
 @end