Facebook/6.12.0.2

AppLovin · Feb 19, 2023 · d2ff889 · d2ff889
1 parent d213817
commit d2ff889
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 16 deletions.
diff --git a/Facebook/AppLovinMediationFacebookAdapter.podspec b/Facebook/AppLovinMediationFacebookAdapter.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
 
 s.authors = 'AppLovin Corporation'
 s.name = 'AppLovinMediationFacebookAdapter'
-s.version = '6.12.0.1'
+s.version = '6.12.0.2'
 s.platform = :ios, '10.0'
 s.summary = 'Facebook adapter used for mediation with the AppLovin MAX SDK'
 s.homepage = "https://github.com/CocoaPods/Specs/search?o=desc&q=#{s.name}&s=indexed"
@@ -34,7 +34,8 @@ s.pod_target_xcconfig =
 {
   'VALID_ARCHS' => 'arm64 arm64e armv7 armv7s x86_64',
   'VALID_ARCHS[sdk=iphoneos*]' => 'arm64 arm64e armv7 armv7s',
-  'VALID_ARCHS[sdk=iphonesimulator*]' => 'arm64 arm64e x86_64'
+  'VALID_ARCHS[sdk=iphonesimulator*]' => 'arm64 arm64e x86_64',
+  'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386'
 }
 
 s.description = <<-DESC

diff --git a/Facebook/CHANGELOG.md b/Facebook/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 6.12.0.2
+* Add support for passing in a presenting view controller.
+
 ## 6.12.0.1
 * Support for native ads in external plugins (e.g. React Native).
 * Disable bitcode, as Apple deprecated it in Xcode 14 (https://developer.apple.com/documentation/xcode-release-notes/xcode-14-release-notes).

diff --git a/Facebook/FacebookAdapter/ALFacebookMediationAdapter.h b/Facebook/FacebookAdapter/ALFacebookMediationAdapter.h
@@ -8,6 +8,6 @@
 
 #import <AppLovinSDK/AppLovinSDK.h>
 
-@interface ALFacebookMediationAdapter : ALMediationAdapter<MAInterstitialAdapter, MARewardedAdapter, MARewardedInterstitialAdapter, MAAdViewAdapter, MANativeAdAdapter, MASignalProvider>
+@interface ALFacebookMediationAdapter : ALMediationAdapter <MAInterstitialAdapter, MARewardedAdapter, MARewardedInterstitialAdapter, MAAdViewAdapter, MANativeAdAdapter, MASignalProvider>
 
 @end
diff --git a/Facebook/FacebookAdapter/ALFacebookMediationAdapter.m b/Facebook/FacebookAdapter/ALFacebookMediationAdapter.m
@@ -9,29 +9,29 @@
 #import "ALFacebookMediationAdapter.h"
 #import <FBAudienceNetwork/FBAudienceNetwork.h>
 
-#define ADAPTER_VERSION @"6.12.0.1"
+#define ADAPTER_VERSION @"6.12.0.2"
 #define MEDIATION_IDENTIFIER [NSString stringWithFormat: @"APPLOVIN_%@:%@", [ALSdk version], self.adapterVersion]
 
-@interface ALFacebookMediationAdapterInterstitialAdDelegate : NSObject<FBInterstitialAdDelegate>
+@interface ALFacebookMediationAdapterInterstitialAdDelegate : NSObject <FBInterstitialAdDelegate>
 @property (nonatomic,   weak) ALFacebookMediationAdapter *parentAdapter;
 @property (nonatomic, strong) id<MAInterstitialAdapterDelegate> delegate;
 - (instancetype)initWithParentAdapter:(ALFacebookMediationAdapter *)parentAdapter andNotify:(id<MAInterstitialAdapterDelegate>)delegate;
 @end
 
-@interface ALFacebookMediationAdapterRewardedVideoAdDelegate : NSObject<FBRewardedVideoAdDelegate>
+@interface ALFacebookMediationAdapterRewardedVideoAdDelegate : NSObject <FBRewardedVideoAdDelegate>
 @property (nonatomic,   weak) ALFacebookMediationAdapter *parentAdapter;
 @property (nonatomic, strong) id<MARewardedAdapterDelegate> delegate;
 @property (nonatomic, assign, getter=hasGrantedReward) BOOL grantedReward;
 - (instancetype)initWithParentAdapter:(ALFacebookMediationAdapter *)parentAdapter andNotify:(id<MARewardedAdapterDelegate>)delegate;
 @end
-@interface ALFacebookMediationAdapterRewardedInterAdDelegate : NSObject<FBRewardedVideoAdDelegate>
+@interface ALFacebookMediationAdapterRewardedInterAdDelegate : NSObject <FBRewardedVideoAdDelegate>
 @property (nonatomic,   weak) ALFacebookMediationAdapter *parentAdapter;
 @property (nonatomic, strong) id<MARewardedInterstitialAdapterDelegate> delegate;
 @property (nonatomic, assign, getter=hasGrantedReward) BOOL grantedReward;
 - (instancetype)initWithParentAdapter:(ALFacebookMediationAdapter *)parentAdapter andNotify:(id<MARewardedInterstitialAdapterDelegate>)delegate;
 @end
 
-@interface ALFacebookMediationAdapterAdViewDelegate : NSObject<FBAdViewDelegate>
+@interface ALFacebookMediationAdapterAdViewDelegate : NSObject <FBAdViewDelegate>
 @property (nonatomic,   weak) MAAdFormat *format;
 @property (nonatomic,   weak) ALFacebookMediationAdapter *parentAdapter;
 @property (nonatomic, strong) id<MAAdViewAdapterDelegate> delegate;
@@ -40,7 +40,7 @@ - (instancetype)initWithParentAdapter:(ALFacebookMediationAdapter *)parentAdapte
                             andNotify:(id<MAAdViewAdapterDelegate>)delegate;
 @end
 
-@interface ALFacebookMediationAdapterNativeAdViewAdDelegate : NSObject<FBNativeAdDelegate>
+@interface ALFacebookMediationAdapterNativeAdViewAdDelegate : NSObject <FBNativeAdDelegate>
 @property (nonatomic,   weak) MAAdFormat *format;
 @property (nonatomic,   weak) ALFacebookMediationAdapter *parentAdapter;
 @property (nonatomic, strong) id<MAAdViewAdapterDelegate> delegate;
@@ -51,7 +51,7 @@ - (instancetype)initWithParentAdapter:(ALFacebookMediationAdapter *)parentAdapte
                             andNotify:(id<MAAdViewAdapterDelegate>)delegate;
 @end
 
-@interface ALFacebookMediationAdapterNativeAdDelegate : NSObject<FBNativeAdDelegate>
+@interface ALFacebookMediationAdapterNativeAdDelegate : NSObject <FBNativeAdDelegate>
 @property (nonatomic,   weak) ALFacebookMediationAdapter *parentAdapter;
 @property (nonatomic, strong) id<MANativeAdAdapterDelegate> delegate;
 @property (nonatomic, strong) NSDictionary<NSString *, id> *serverParameters;
@@ -60,7 +60,7 @@ - (instancetype)initWithParentAdapter:(ALFacebookMediationAdapter *)parentAdapte
                             andNotify:(id<MANativeAdAdapterDelegate>)delegate;
 @end
 
-@interface ALFacebookMediationAdapterNativeBannerAdDelegate : NSObject<FBNativeBannerAdDelegate>
+@interface ALFacebookMediationAdapterNativeBannerAdDelegate : NSObject <FBNativeBannerAdDelegate>
 @property (nonatomic,   weak) ALFacebookMediationAdapter *parentAdapter;
 @property (nonatomic, strong) id<MANativeAdAdapterDelegate> delegate;
 @property (nonatomic, strong) NSDictionary<NSString *, id> *serverParameters;
@@ -75,7 +75,7 @@ - (instancetype)initWithParentAdapter:(ALFacebookMediationAdapter *)parentAdapte
 - (instancetype)initWithFormat:(MAAdFormat *)format builderBlock:(NS_NOESCAPE MANativeAdBuilderBlock)builderBlock NS_UNAVAILABLE;
 @end
 
-@interface ALFacebookMediationAdapter()
+@interface ALFacebookMediationAdapter ()
 
 @property (nonatomic, strong) FBInterstitialAd *interstitialAd;
 @property (nonatomic, strong) FBRewardedVideoAd *rewardedVideoAd;
@@ -112,7 +112,7 @@ + (void)initialize
 
 #pragma mark - MAAdapter Methods
 
-- (void)initializeWithParameters:(id<MAAdapterInitializationParameters>)parameters completionHandler:(void (^)(MAAdapterInitializationStatus, NSString * _Nullable))completionHandler
+- (void)initializeWithParameters:(id<MAAdapterInitializationParameters>)parameters completionHandler:(void (^)(MAAdapterInitializationStatus, NSString *_Nullable))completionHandler
 {
     [self updateAdSettingsWithParameters: parameters];
 
@@ -337,7 +337,17 @@ - (void)showRewardedAdForParameters:(id<MAAdapterResponseParameters>)parameters
         // Configure reward from server.
         [self configureRewardForParameters: parameters];
 
-        [self.rewardedVideoAd showAdFromRootViewController: [ALUtils topViewControllerFromKeyWindow]];
+        UIViewController *presentingViewController;
+        if ( ALSdk.versionCode >= 11020199 )
+        {
+            presentingViewController = parameters.presentingViewController ?: [ALUtils topViewControllerFromKeyWindow];
+        }
+        else
+        {
+            presentingViewController = [ALUtils topViewControllerFromKeyWindow];
+        }
+
+        [self.rewardedVideoAd showAdFromRootViewController: presentingViewController];
     }
     else
     {
@@ -860,7 +870,7 @@ - (UIViewController *)viewControllerForPresentingModalView
 @implementation ALFacebookMediationAdapterNativeAdViewAdDelegate
 
 - (instancetype)initWithParentAdapter:(ALFacebookMediationAdapter *)parentAdapter
-                     serverParameters:(NSDictionary<NSString *,id> *)serverParameters
+                     serverParameters:(NSDictionary<NSString *, id> *)serverParameters
                                format:(MAAdFormat *)format
                             andNotify:(id<MAAdViewAdapterDelegate>)delegate
 {
@@ -1111,7 +1121,7 @@ - (void)nativeAdDidFinishHandlingClick:(FBNativeAd *)nativeAd
 @implementation ALFacebookMediationAdapterNativeBannerAdDelegate
 
 - (instancetype)initWithParentAdapter:(ALFacebookMediationAdapter *)parentAdapter
-                     serverParameters:(NSDictionary<NSString *,id> *)serverParameters
+                     serverParameters:(NSDictionary<NSString *, id> *)serverParameters
                             andNotify:(id<MANativeAdAdapterDelegate>)delegate
 {
     self = [super init];