v7.6

* commit '7169b4e83624adf386316041f35d6d6bc82cbf12': v7.6 Fixed BannerVideo reload Admob SDK v7.64.0 Merge pull request #611 in MOBILE-SDK/app_mobile-sdk-ios from UpdateErrorCodes to develop Merge pull request #591 in MOBILE-SDK/app_mobile-sdk-ios from MS-4398_logDidImpressionAPI_iOS to develop Merge pull request #573 in MOBILE-SDK/app_mobile-sdk-ios from MS-4362_ErrorCodes_FB to develop Merge pull request #602 in MOBILE-SDK/app_mobile-sdk-ios from 20200722,1257--dreeder--add--CI_tools_to_MobileSDK_repo to develop Merge pull request #610 in MOBILE-SDK/app_mobile-sdk-ios from MS-4473_Force_CreativeID to develop Merge pull request #608 in MOBILE-SDK/app_mobile-sdk-ios from MS-4442_IDFA to develop Added OMID signals
appnexus · Aug 27, 2020 · d45ebb1 · d45ebb1
2 parents f87a0f0 + 7169b4e
commit d45ebb1
Show file tree

Hide file tree

Showing 106 changed files with 3,243 additions and 364 deletions.
diff --git a/AppNexusSDK.podspec b/AppNexusSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "AppNexusSDK"
-  s.version      = "7.5"
+  s.version      = "7.6"
   s.platform     = :ios, "9.0"
 
   s.summary      = "AppNexus iOS Mobile Advertising SDK"
@@ -29,7 +29,7 @@ DESC
 
   s.subspec 'GoogleAdapter' do |subspec|
     subspec.dependency  'AppNexusSDK/AppNexusSDK', "#{s.version}"
-    subspec.dependency  'Google-Mobile-Ads-SDK', '7.55.0'
+    subspec.dependency  'Google-Mobile-Ads-SDK', '7.64.0'
     subspec.source_files         = "mediation/mediatedviews/GoogleAdMob/*.{h,m}"
     subspec.public_header_files  = "mediation/mediatedviews/GoogleAdMob/ANAdAdapterNativeAdMob.h"
     subspec.xcconfig              = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/Google-Mobile-Ads-SDK/**' }

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,16 @@
+## 7.6
+### New Features
++ MS-4433: Support for iOS 14 [https://wiki.xandr.com/x/3Ie1Bg]
++ MS-4268: Support for Open Measurement SDK Open RTB Signals
++ MS-4473: Added support for forcing the creative Id in Ad request for test/debug purposes
++ MS-4361: Added onAdImpression callback for the Native Ads [https://wiki.xandr.com/x/xoe1Bg]
+
+### Mediation partner upgrade
++ MS-4497: Upgraded Google AdMob SDK to v7.64.0
+
+### Improvements/Bug Fixes
++ MS-4362: Ad ResultCode is now a class instead of enum - this fixes issue with result codes getting overridden for concurrent Ad requests
+
 ## 7.5
 ### New Feature
 + MS-4384: Added support for Auction timeout [https://wiki.xandr.com/x/noS1Bg]

diff --git a/csr/Facebook/ANAdAdapterCSRNativeBannerFacebook.h b/csr/Facebook/ANAdAdapterCSRNativeBannerFacebook.h
@@ -25,7 +25,6 @@ limitations under the License.
 #endif
 #import <FBAudienceNetwork/FBAudienceNetwork.h>
 
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ANAdAdapterCSRNativeBannerFacebook : NSObject

diff --git a/csr/Facebook/ANAdAdapterCSRNativeBannerFacebook.m b/csr/Facebook/ANAdAdapterCSRNativeBannerFacebook.m
@@ -14,6 +14,13 @@
  */
 
 #import "ANAdAdapterCSRNativeBannerFacebook.h"
+
+typedef NS_ENUM(NSUInteger, FBRequestError) {
+    FBNoFill = 1001,
+    FBAdLoadTooFrequently = 1002,
+    FBInternalError = 2001
+};
+
 @import FBAudienceNetwork;
 
 @protocol ANCSRNativeAdRequestAdDelegate;
@@ -73,6 +80,7 @@ - (void)showNativeBannerAd
     [self.requestDelegate didLoadNativeAd:self.csrNativeAdResponse];
 }
 
+
 #pragma mark FBNativeBannerAdDelegate
 
 - (void)nativeBannerAdDidDownloadMedia:(FBNativeBannerAd *)nativeBannerAd{
@@ -86,9 +94,20 @@ - (void)nativeBannerAdWillLogImpression:(FBNativeBannerAd *)nativeBannerAd{
 
 - (void)nativeBannerAd:(FBNativeBannerAd *)nativeBannerAd didFailWithError:(NSError *)error{
     ANLogError(@"Error loading Facebook banner native ad: %@", error);
-    ANAdResponseCode code = ANAdResponseInternalError;
-    if (error.code == 1001) {
-        code = ANAdResponseUnableToFill;
+    ANAdResponseCode *code;
+    switch (error.code) {
+        case FBNoFill:
+            code = ANAdResponseCode.UNABLE_TO_FILL;
+            break;
+        case FBAdLoadTooFrequently:
+            code = ANAdResponseCode.REQUEST_TOO_FREQUENT;
+            break;
+        case FBInternalError:
+            code = ANAdResponseCode.INTERNAL_ERROR;
+            break;
+        default:
+            code = [ANAdResponseCode CUSTOM_ADAPTER_ERROR:[NSString stringWithFormat:@"Error: %ld Message: %@", (long)error.code, error.localizedDescription]];
+            break;
     }
     [self.requestDelegate didFailToLoadNativeAd:code];
 }

diff --git a/mediation/mediatedviews/Amazon/ANAdAdapterBaseAmazon.m b/mediation/mediatedviews/Amazon/ANAdAdapterBaseAmazon.m
@@ -63,22 +63,22 @@ - (AmazonAdOptions *)adOptionsForTargetingParameters:(ANTargetingParameters *)ta
 
 - (void)handleAmazonError:(AmazonAdError *)amazonError {
     ANLogDebug(@"Received error from Amazon with description: %@", amazonError.description);
-    ANAdResponseCode responseCode = ANAdResponseInternalError;
+    ANAdResponseCode *responseCode = ANAdResponseCode.INTERNAL_ERROR;
     switch (amazonError.errorCode) {
         case AmazonAdErrorRequest:
-            responseCode = ANAdResponseInvalidRequest;
+            responseCode = ANAdResponseCode.INVALID_REQUEST;
             break;
         case AmazonAdErrorNoFill:
-            responseCode = ANAdResponseUnableToFill;
+            responseCode = ANAdResponseCode.UNABLE_TO_FILL;
             break;
         case AmazonAdErrorInternalServer:
-            responseCode = ANAdResponseInternalError;
+            responseCode = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case AmazonAdErrorNetworkConnection:
-            responseCode = ANAdResponseNetworkError;
+            responseCode = ANAdResponseCode.NETWORK_ERROR;
             break;
         case AmazonAdErrorReserved:
-            responseCode = ANAdResponseInternalError;
+            responseCode = ANAdResponseCode.INTERNAL_ERROR;
             break;
         default:
             break;

diff --git a/mediation/mediatedviews/Facebook/ANAdAdapterBannerFacebook.m b/mediation/mediatedviews/Facebook/ANAdAdapterBannerFacebook.m
@@ -46,7 +46,7 @@ - (void)requestBannerAdWithSize:(CGSize)size
         fbAdSize = kFBAdSizeHeight250Rectangle;
         frame = CGRectMake(0, 0, 1, 250);
     } else {
-        [self.delegate didFailToLoadAd:ANAdResponseUnableToFill];
+        [self.delegate didFailToLoadAd:ANAdResponseCode.UNABLE_TO_FILL];
         return;
     }
 
@@ -62,9 +62,9 @@ - (void)requestBannerAdWithSize:(CGSize)size
 
 - (void)adView:(FBAdView *)adView didFailWithError:(NSError *)error {
     ANLogDebug(@"Facebook banner failed to load with error: %@", error);
-    ANAdResponseCode code = ANAdResponseInternalError;
+    ANAdResponseCode *code = ANAdResponseCode.INTERNAL_ERROR;
     if (error.code == 1001) {
-        code = ANAdResponseUnableToFill;
+        code = ANAdResponseCode.UNABLE_TO_FILL;
     }
     [self.delegate didFailToLoadAd:code];
 }

diff --git a/mediation/mediatedviews/Facebook/ANAdAdapterInterstitialFacebook.m b/mediation/mediatedviews/Facebook/ANAdAdapterInterstitialFacebook.m
@@ -54,9 +54,9 @@ - (void)interstitialAdDidLoad:(FBInterstitialAd *)interstitialAd {
 }
 
 - (void)interstitialAd:(FBInterstitialAd *)interstitialAd didFailWithError:(NSError *)error {
-    ANAdResponseCode code = ANAdResponseInternalError;
+    ANAdResponseCode *code = ANAdResponseCode.INTERNAL_ERROR;
     if (error.code == 1001) {
-        code = ANAdResponseUnableToFill;
+        code = ANAdResponseCode.UNABLE_TO_FILL;;
     }
     [self.delegate didFailToLoadAd:code];
 }

diff --git a/mediation/mediatedviews/Facebook/ANAdAdapterNativeFacebook.m b/mediation/mediatedviews/Facebook/ANAdAdapterNativeFacebook.m
@@ -108,9 +108,9 @@ - (void)unregisterViewFromTracking {
 
 - (void)nativeAd:(FBNativeAd *)nativeAd didFailWithError:(NSError *)error {
     ANLogError(@"Error loading Facebook native ad: %@", error);
-    ANAdResponseCode code = ANAdResponseInternalError;
+    ANAdResponseCode *code = ANAdResponseCode.INTERNAL_ERROR;
     if (error.code == 1001) {
-        code = ANAdResponseUnableToFill;
+        code = ANAdResponseCode.UNABLE_TO_FILL;
     }
     [self.requestDelegate didFailToLoadNativeAd:code];
 }

diff --git a/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerAdMob.m b/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerAdMob.m
@@ -104,47 +104,47 @@ - (void)adViewDidReceiveAd:(GADBannerView *)view
 - (void)adView:(GADBannerView *)view didFailToReceiveAdWithError:(GADRequestError *)error
 {
     ANLogDebug(@"AdMob banner failed to load with error: %@", error);
-    ANAdResponseCode code = ANAdResponseInternalError;
+    ANAdResponseCode *code = ANAdResponseCode.INTERNAL_ERROR;
 
     switch (error.code) {
         case kGADErrorInvalidRequest:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         case kGADErrorNoFill:
-            code = ANAdResponseUnableToFill;
+            code = ANAdResponseCode.UNABLE_TO_FILL;
             break;
         case kGADErrorNetworkError:
-            code = ANAdResponseNetworkError;
+            code = ANAdResponseCode.NETWORK_ERROR;
             break;
         case kGADErrorServerError:
-            code = ANAdResponseNetworkError;
+            code = ANAdResponseCode.NETWORK_ERROR;
             break;
         case kGADErrorOSVersionTooLow:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorTimeout:
-            code = ANAdResponseNetworkError;
+            code = ANAdResponseCode.NETWORK_ERROR;
             break;
         case kGADErrorAdAlreadyUsed:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorMediationDataError:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         case kGADErrorMediationAdapterError:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorMediationInvalidAdSize:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         case kGADErrorInternalError:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorInvalidArgument:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         default:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
     }
 

diff --git a/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerDFP.m b/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerDFP.m
@@ -144,7 +144,7 @@ -(void)adReceiveAd{
         if (self.retryCount<kANTotalRetries) {
             if (self.secondPriceIsHigher) {
                 [self.timer invalidate];
-                [self.delegate didFailToLoadAd:ANAdResponseUnableToFill];
+                [self.delegate didFailToLoadAd:ANAdResponseCode.UNABLE_TO_FILL];
             }
         }else{
             [self.timer invalidate];
@@ -168,47 +168,47 @@ - (void)adViewDidReceiveAd:(DFPBannerView *)view
 - (void)adView:(GADBannerView *)view didFailToReceiveAdWithError:(GADRequestError *)error
 {
     ANLogDebug(@"DFP banner failed to load with error: %@", [error localizedDescription]);
-    ANAdResponseCode code = ANAdResponseInternalError;
+    ANAdResponseCode *code = ANAdResponseCode.INTERNAL_ERROR;
 
     switch (error.code) {
         case kGADErrorInvalidRequest:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         case kGADErrorNoFill:
-            code = ANAdResponseUnableToFill;
+            code = ANAdResponseCode.UNABLE_TO_FILL;
             break;
         case kGADErrorNetworkError:
-            code = ANAdResponseNetworkError;
+            code = ANAdResponseCode.NETWORK_ERROR;
             break;
         case kGADErrorServerError:
-            code = ANAdResponseNetworkError;
+            code = ANAdResponseCode.NETWORK_ERROR;
             break;
         case kGADErrorOSVersionTooLow:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorTimeout:
-            code = ANAdResponseNetworkError;
+            code = ANAdResponseCode.NETWORK_ERROR;
             break;
         case kGADErrorAdAlreadyUsed:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorMediationDataError:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         case kGADErrorMediationAdapterError:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorMediationInvalidAdSize:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         case kGADErrorInternalError:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorInvalidArgument:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         default:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
     }
     [self.timer invalidate];

diff --git a/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBaseDFP.h b/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBaseDFP.h
@@ -31,6 +31,6 @@
 + (GADRequest *)googleAdRequestFromTargetingParameters:(ANTargetingParameters *)targetingParameters;
 + (DFPRequest *)dfpRequestFromTargetingParameters:(ANTargetingParameters *)targetingParameters;
 
-+ (ANAdResponseCode)responseCodeFromRequestError:(GADRequestError *)error;
++ (ANAdResponseCode *)responseCodeFromRequestError:(GADRequestError *)error;
 
 @end
diff --git a/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBaseDFP.m b/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBaseDFP.m
@@ -67,48 +67,48 @@ + (GADRequest *)completeAdRequest: (GADRequest *)gadRequest
 }
 
 
-+ (ANAdResponseCode)responseCodeFromRequestError:(GADRequestError *)error {
-    ANAdResponseCode code = ANAdResponseInternalError;
++ (ANAdResponseCode *)responseCodeFromRequestError:(GADRequestError *)error {
+    ANAdResponseCode *code = ANAdResponseCode.INTERNAL_ERROR;
 
     switch (error.code) {
         case kGADErrorInvalidRequest:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         case kGADErrorNoFill:
-            code = ANAdResponseUnableToFill;
+            code = ANAdResponseCode.UNABLE_TO_FILL;
             break;
         case kGADErrorNetworkError:
-            code = ANAdResponseNetworkError;
+            code = ANAdResponseCode.NETWORK_ERROR;
             break;
         case kGADErrorServerError:
-            code = ANAdResponseNetworkError;
+            code = ANAdResponseCode.NETWORK_ERROR;
             break;
         case kGADErrorOSVersionTooLow:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorTimeout:
-            code = ANAdResponseNetworkError;
+            code = ANAdResponseCode.NETWORK_ERROR;
             break;
         case kGADErrorAdAlreadyUsed:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorMediationDataError:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         case kGADErrorMediationAdapterError:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorMediationInvalidAdSize:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         case kGADErrorInternalError:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
         case kGADErrorInvalidArgument:
-            code = ANAdResponseInvalidRequest;
+            code = ANAdResponseCode.INVALID_REQUEST;
             break;
         default:
-            code = ANAdResponseInternalError;
+            code = ANAdResponseCode.INTERNAL_ERROR;
             break;
     }
     return code;
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,6 @@ limitations under the License. @@
     #endif
     #import <FBAudienceNetwork/FBAudienceNetwork.h>
     NS_ASSUME_NONNULL_BEGIN
     @interface ANAdAdapterCSRNativeBannerFacebook : NSObject
@@ Expand Down @@