Skip to content

Commit

Permalink
MS-939 Handle about:blank URLs correctly, MS-940 Updated to latest me…
Browse files Browse the repository at this point in the history
…diated SDKs
  • Loading branch information
Jose Cabal-Ugaz committed Feb 19, 2015
1 parent 2109165 commit af94a6a
Show file tree
Hide file tree
Showing 105 changed files with 516 additions and 468 deletions.
120 changes: 17 additions & 103 deletions BinaryProjects/ANSDK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,8 @@
8A3EC16C19B8FD9A0049CD29 /* ANBannerAdView+ANContentViewTransitions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ANBannerAdView+ANContentViewTransitions.h"; sourceTree = "<group>"; };
8A3EC16D19B8FD9A0049CD29 /* ANBannerAdView+ANContentViewTransitions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ANBannerAdView+ANContentViewTransitions.m"; sourceTree = "<group>"; };
8A3EC16F19B8FDC70049CD29 /* ANMRAID.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ANMRAID.bundle; sourceTree = "<group>"; };
8A4018191A95213200D56208 /* GoogleMobileAds.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleMobileAds.framework; sourceTree = "<group>"; };
8A40181F1A95224800D56208 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
8A4FF3A01A2F72D00000E4CC /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
8A4FF3A31A2F8ACC0000E4CC /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
8A4FF3A51A2F8AFE0000E4CC /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
Expand All @@ -474,39 +476,9 @@
8A944DDE19D5AF8C007AAAB0 /* AmazonAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AmazonAd.framework; sourceTree = "<group>"; };
8A944DDF19D5AF8C007AAAB0 /* NOTICE-AMAZON.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "NOTICE-AMAZON.txt"; sourceTree = "<group>"; };
8A944DE119D5AF94007AAAB0 /* FBAudienceNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FBAudienceNetwork.framework; sourceTree = "<group>"; };
8A944DE519D5AFAB007AAAB0 /* DFPBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DFPBannerView.h; sourceTree = "<group>"; };
8A944DE619D5AFAB007AAAB0 /* DFPExtras.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DFPExtras.h; sourceTree = "<group>"; };
8A944DE719D5AFAB007AAAB0 /* DFPInterstitial.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DFPInterstitial.h; sourceTree = "<group>"; };
8A944DE819D5AFAB007AAAB0 /* DFPSwipeableBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DFPSwipeableBannerView.h; sourceTree = "<group>"; };
8A944DE919D5AFAB007AAAB0 /* GADAdSizeDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADAdSizeDelegate.h; sourceTree = "<group>"; };
8A944DEA19D5AFAB007AAAB0 /* GADAppEventDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADAppEventDelegate.h; sourceTree = "<group>"; };
8A944DEB19D5AFAB007AAAB0 /* GADSwipeableBannerViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADSwipeableBannerViewDelegate.h; sourceTree = "<group>"; };
8A944DED19D5AFAB007AAAB0 /* GADCustomEventBanner.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADCustomEventBanner.h; sourceTree = "<group>"; };
8A944DEE19D5AFAB007AAAB0 /* GADCustomEventBannerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADCustomEventBannerDelegate.h; sourceTree = "<group>"; };
8A944DEF19D5AFAB007AAAB0 /* GADCustomEventExtras.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADCustomEventExtras.h; sourceTree = "<group>"; };
8A944DF019D5AFAB007AAAB0 /* GADCustomEventInterstitial.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADCustomEventInterstitial.h; sourceTree = "<group>"; };
8A944DF119D5AFAB007AAAB0 /* GADCustomEventInterstitialDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADCustomEventInterstitialDelegate.h; sourceTree = "<group>"; };
8A944DF219D5AFAB007AAAB0 /* GADCustomEventRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADCustomEventRequest.h; sourceTree = "<group>"; };
8A944DF419D5AFAB007AAAB0 /* GADSearchBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADSearchBannerView.h; sourceTree = "<group>"; };
8A944DF519D5AFAB007AAAB0 /* GADSearchRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADSearchRequest.h; sourceTree = "<group>"; };
8A944DF619D5AFAB007AAAB0 /* GADAdMobExtras.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADAdMobExtras.h; sourceTree = "<group>"; };
8A944DF719D5AFAB007AAAB0 /* GADAdNetworkExtras.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADAdNetworkExtras.h; sourceTree = "<group>"; };
8A944DF819D5AFAB007AAAB0 /* GADAdSize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADAdSize.h; sourceTree = "<group>"; };
8A944DF919D5AFAB007AAAB0 /* GADBannerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADBannerView.h; sourceTree = "<group>"; };
8A944DFA19D5AFAB007AAAB0 /* GADBannerViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADBannerViewDelegate.h; sourceTree = "<group>"; };
8A944DFB19D5AFAB007AAAB0 /* GADInAppPurchase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADInAppPurchase.h; sourceTree = "<group>"; };
8A944DFC19D5AFAB007AAAB0 /* GADInAppPurchaseDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADInAppPurchaseDelegate.h; sourceTree = "<group>"; };
8A944DFD19D5AFAB007AAAB0 /* GADInterstitial.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADInterstitial.h; sourceTree = "<group>"; };
8A944DFE19D5AFAB007AAAB0 /* GADInterstitialDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADInterstitialDelegate.h; sourceTree = "<group>"; };
8A944DFF19D5AFAB007AAAB0 /* GADModules.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADModules.h; sourceTree = "<group>"; };
8A944E0019D5AFAB007AAAB0 /* GADRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADRequest.h; sourceTree = "<group>"; };
8A944E0119D5AFAB007AAAB0 /* GADRequestError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GADRequestError.h; sourceTree = "<group>"; };
8A944E0219D5AFAB007AAAB0 /* GoogleAdMobSDKReadme.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = GoogleAdMobSDKReadme.txt; sourceTree = "<group>"; };
8A944E0319D5AFAB007AAAB0 /* libGoogleAdMobAds.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libGoogleAdMobAds.a; sourceTree = "<group>"; };
8A944E0519D5AFBB007AAAB0 /* LICENSE-MILLENNIAL MEDIA.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "LICENSE-MILLENNIAL MEDIA.txt"; sourceTree = "<group>"; };
8A944E0619D5AFBB007AAAB0 /* MillennialMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MillennialMedia.framework; sourceTree = "<group>"; };
8A944E0819D5AFCD007AAAB0 /* libMoPubSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMoPubSDK.a; sourceTree = "<group>"; };
8A944E0919D5AFCD007AAAB0 /* LICENSE-MOPUB */ = {isa = PBXFileReference; lastKnownFileType = text; path = "LICENSE-MOPUB"; sourceTree = "<group>"; };
8A944E0A19D5AFCD007AAAB0 /* MPAdBrowserController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MPAdBrowserController.xib; sourceTree = "<group>"; };
8A944E0B19D5AFCD007AAAB0 /* MPAdConversionTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAdConversionTracker.h; sourceTree = "<group>"; };
8A944E0C19D5AFCD007AAAB0 /* MPAdPositioning.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAdPositioning.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -832,6 +804,15 @@
name = native;
sourceTree = "<group>";
};
8A4018181A95213200D56208 /* GoogleAdMobSDK */ = {
isa = PBXGroup;
children = (
8A4018191A95213200D56208 /* GoogleMobileAds.framework */,
);
name = GoogleAdMobSDK;
path = ../mediation/mediatedviews/GoogleAdMob/GoogleAdMobSDK;
sourceTree = "<group>";
};
8A944DDD19D5AF8C007AAAB0 /* AmazonSDK */ = {
isa = PBXGroup;
children = (
Expand All @@ -850,75 +831,6 @@
path = ../mediation/mediatedviews/Facebook/FacebookSDK;
sourceTree = "<group>";
};
8A944DE219D5AFAB007AAAB0 /* GoogleAdMobSDK */ = {
isa = PBXGroup;
children = (
8A944DE319D5AFAB007AAAB0 /* Add-ons */,
8A944DF619D5AFAB007AAAB0 /* GADAdMobExtras.h */,
8A944DF719D5AFAB007AAAB0 /* GADAdNetworkExtras.h */,
8A944DF819D5AFAB007AAAB0 /* GADAdSize.h */,
8A944DF919D5AFAB007AAAB0 /* GADBannerView.h */,
8A944DFA19D5AFAB007AAAB0 /* GADBannerViewDelegate.h */,
8A944DFB19D5AFAB007AAAB0 /* GADInAppPurchase.h */,
8A944DFC19D5AFAB007AAAB0 /* GADInAppPurchaseDelegate.h */,
8A944DFD19D5AFAB007AAAB0 /* GADInterstitial.h */,
8A944DFE19D5AFAB007AAAB0 /* GADInterstitialDelegate.h */,
8A944DFF19D5AFAB007AAAB0 /* GADModules.h */,
8A944E0019D5AFAB007AAAB0 /* GADRequest.h */,
8A944E0119D5AFAB007AAAB0 /* GADRequestError.h */,
8A944E0219D5AFAB007AAAB0 /* GoogleAdMobSDKReadme.txt */,
8A944E0319D5AFAB007AAAB0 /* libGoogleAdMobAds.a */,
);
name = GoogleAdMobSDK;
path = ../mediation/mediatedviews/GoogleAdMob/GoogleAdMobSDK;
sourceTree = "<group>";
};
8A944DE319D5AFAB007AAAB0 /* Add-ons */ = {
isa = PBXGroup;
children = (
8A944DE419D5AFAB007AAAB0 /* DoubleClick */,
8A944DEC19D5AFAB007AAAB0 /* Mediation */,
8A944DF319D5AFAB007AAAB0 /* Search */,
);
path = "Add-ons";
sourceTree = "<group>";
};
8A944DE419D5AFAB007AAAB0 /* DoubleClick */ = {
isa = PBXGroup;
children = (
8A944DE519D5AFAB007AAAB0 /* DFPBannerView.h */,
8A944DE619D5AFAB007AAAB0 /* DFPExtras.h */,
8A944DE719D5AFAB007AAAB0 /* DFPInterstitial.h */,
8A944DE819D5AFAB007AAAB0 /* DFPSwipeableBannerView.h */,
8A944DE919D5AFAB007AAAB0 /* GADAdSizeDelegate.h */,
8A944DEA19D5AFAB007AAAB0 /* GADAppEventDelegate.h */,
8A944DEB19D5AFAB007AAAB0 /* GADSwipeableBannerViewDelegate.h */,
);
path = DoubleClick;
sourceTree = "<group>";
};
8A944DEC19D5AFAB007AAAB0 /* Mediation */ = {
isa = PBXGroup;
children = (
8A944DED19D5AFAB007AAAB0 /* GADCustomEventBanner.h */,
8A944DEE19D5AFAB007AAAB0 /* GADCustomEventBannerDelegate.h */,
8A944DEF19D5AFAB007AAAB0 /* GADCustomEventExtras.h */,
8A944DF019D5AFAB007AAAB0 /* GADCustomEventInterstitial.h */,
8A944DF119D5AFAB007AAAB0 /* GADCustomEventInterstitialDelegate.h */,
8A944DF219D5AFAB007AAAB0 /* GADCustomEventRequest.h */,
);
path = Mediation;
sourceTree = "<group>";
};
8A944DF319D5AFAB007AAAB0 /* Search */ = {
isa = PBXGroup;
children = (
8A944DF419D5AFAB007AAAB0 /* GADSearchBannerView.h */,
8A944DF519D5AFAB007AAAB0 /* GADSearchRequest.h */,
);
path = Search;
sourceTree = "<group>";
};
8A944E0419D5AFBB007AAAB0 /* MillennialMediaSDK */ = {
isa = PBXGroup;
children = (
Expand All @@ -933,7 +845,6 @@
isa = PBXGroup;
children = (
8A944E0819D5AFCD007AAAB0 /* libMoPubSDK.a */,
8A944E0919D5AFCD007AAAB0 /* LICENSE-MOPUB */,
8AC662A319DC9E07004025D5 /* MoPub-Bridging-Header.h */,
8A944E0A19D5AFCD007AAAB0 /* MPAdBrowserController.xib */,
8A944E0B19D5AFCD007AAAB0 /* MPAdConversionTracker.h */,
Expand All @@ -944,6 +855,7 @@
8A944E1019D5AFCD007AAAB0 /* MPClientAdPositioning.h */,
8A944E1119D5AFCD007AAAB0 /* MPCloseButtonX.png */,
8A944E1219D5AFCD007AAAB0 /* [email protected] */,
8A40181F1A95224800D56208 /* [email protected] */,
8A944E1319D5AFCD007AAAB0 /* MPCollectionViewAdPlacer.h */,
8A944E1419D5AFCD007AAAB0 /* MPConstants.h */,
8A944E1519D5AFCD007AAAB0 /* MPInterstitialAdController.h */,
Expand Down Expand Up @@ -1183,7 +1095,7 @@
8AE2D7EC19CC891B00001B70 /* ANAdAdapterInterstitialAdMob.m */,
8AE2D7ED19CC891B00001B70 /* ANAdAdapterInterstitialDFP.h */,
8AE2D7EE19CC891B00001B70 /* ANAdAdapterInterstitialDFP.m */,
8A944DE219D5AFAB007AAAB0 /* GoogleAdMobSDK */,
8A4018181A95213200D56208 /* GoogleAdMobSDK */,
);
name = "Google AdMob";
sourceTree = "<group>";
Expand Down Expand Up @@ -2141,6 +2053,7 @@
isa = XCBuildConfiguration;
buildSettings = {
DSTROOT = /tmp/ANSDK.dst;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../mediation/mediatedviews/GoogleAdMob/GoogleAdMobSDK";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -2158,6 +2071,7 @@
isa = XCBuildConfiguration;
buildSettings = {
DSTROOT = /tmp/ANSDK.dst;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../mediation/mediatedviews/GoogleAdMob/GoogleAdMobSDK";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -2285,7 +2199,7 @@
isa = XCBuildConfiguration;
buildSettings = {
DSTROOT = /tmp/ANSDK.dst;
FRAMEWORK_SEARCH_PATHS = "";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../mediation/mediatedviews/GoogleAdMob/GoogleAdMobSDK";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -2302,7 +2216,7 @@
isa = XCBuildConfiguration;
buildSettings = {
DSTROOT = /tmp/ANSDK.dst;
FRAMEWORK_SEARCH_PATHS = "";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../mediation/mediatedviews/GoogleAdMob/GoogleAdMobSDK";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

Facebook Audience Network for iOS
=================================

Documentation is available at https://developers.facebook.com/docs/audience-network.
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
#import "FBNativeAd.h"
#import "FBAdImage.h"

#define FB_AD_SDK_VERSION @"3.22.0"
#define FB_AD_SDK_VERSION @"3.23.0"
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
#import "FBNativeAd.h"
#import "FBAdImage.h"

#define FB_AD_SDK_VERSION @"3.22.0"
#define FB_AD_SDK_VERSION @"3.23.0"
45 changes: 45 additions & 0 deletions mediation/mediatedviews/Facebook/FacebookSDK/README-FACEBOOK.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
Facebook SDK for iOS
====================

This open-source library allows you to integrate Facebook into your iOS app.

Learn more about the provided samples, documentation, integrating the SDK into your app, accessing source code, and more at https://developers.facebook.com/ios

NOTE: By default, the Facebook SDK for iOS is installed in ~/Documents/FacebookSDK

TRY IT OUT
----------
1. Download the SDK at https://developers.facebook.com/ios or via Cocoapods by adding the 'Facebook-iOS-SDK' pod.
2. Test your install: build and run the project at ~/Documents/FacebookSDK/Samples/HelloFacebookSample/HelloFacebookSample.xcodeproj
3. Check-out the tutorials available online at: https://developers.facebook.com/docs/getting-started/getting-started-with-the-ios-sdk
4. Start coding! Visit https://developers.facebook.com/ios for tutorials and reference documentation.

FEATURES
--------
* Login - https://developers.facebook.com/docs/facebook-login
* Sharing - https://developers.facebook.com/docs/sharing
* App Links - https://developers.facebook.com/docs/applinks
* Graph API - https://developers.facebook.com/docs/ios/graph

GIVE FEEDBACK
-------------
Please report bugs or issues to https://developers.facebook.com/bugs/

You can also join the Facebook Developers Group on Facebook (https://www.facebook.com/groups/fbdevelopers/) or ask questions on Stack Overflow (http://facebook.stackoverflow.com)

LICENSE
-------
Except as otherwise noted, the Facebook SDK for iOS is licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.html).

DEVELOPER TERMS
---------------

- By enabling Facebook integrations, including through this SDK, you can share information with Facebook, including information about people’s use of your app. Facebook will use information received in accordance with our Data Use Policy [https://www.facebook.com/about/privacy/], including to provide you with insights about the effectiveness of your ads and the use of your app. These integrations also enable us and our partners to serve ads on and off Facebook.

- You may limit your sharing of information with us by updating the Insights control in the developer tool [https://developers.facebook.com/apps/{app_id}/advanced].

- If you use a Facebook integration, including to share information with us, you agree and confirm that you have provided appropriate and sufficiently prominent notice to and obtained the appropriate consent from your users regarding such collection, use, and disclosure (including, at a minimum, through your privacy policy). You further agree that you will not share information with us about children under the age of 13.

- You agree to comply with all applicable laws and regulations and also agree to our Terms <https://www.facebook.com/policies/>, including our Platform Policies <https://developers.facebook.com/policy/>.and Advertising Guidelines, as applicable <https://www.facebook.com/ad_guidelines.php>.

By using the Facebook SDK for iOS you agree to these terms.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#import "ANBasicConfig.h"
#import ANCUSTOMADAPTERHEADER
#import "GADBannerView.h"
#import <GoogleMobileAds/GoogleMobileAds.h>

@interface ANAdAdapterBannerAdMob : NSObject <ANCUSTOMADAPTERBANNER, GADBannerViewDelegate>

Expand Down
4 changes: 1 addition & 3 deletions mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerAdMob.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#import "ANAdAdapterBannerAdMob.h"
#import "ANLogging.h"

#import "GADAdMobExtras.h"

@interface ANAdAdapterBannerAdMob ()
@property (nonatomic, readwrite, strong) GADBannerView *bannerView;
@end
Expand Down Expand Up @@ -98,7 +96,7 @@ - (GADRequest *)createRequestFromTargetingParameters:(ANTARGETINGPARAMETERS *)ta
accuracy:location.horizontalAccuracy];
}

GADAdMobExtras *extras = [GADAdMobExtras new];
GADExtras *extras = [[GADExtras alloc] init];
extras.additionalParameters = targetingParameters.customKeywords;
[request registerAdNetworkExtras:extras];

Expand Down
4 changes: 1 addition & 3 deletions mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerDFP.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@

#import "ANBasicConfig.h"
#import ANCUSTOMADAPTERHEADER
#import "DFPBannerView.h"
#import "DFPSwipeableBannerView.h"
#import "GADBannerViewDelegate.h"
#import <GoogleMobileAds/GoogleMobileAds.h>

@interface ANAdAdapterBannerDFP : NSObject <ANCUSTOMADAPTERBANNER, GADBannerViewDelegate>

Expand Down
3 changes: 1 addition & 2 deletions mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerDFP.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#import "ANAdAdapterBannerDFP.h"
#import "ANLogging.h"
#import "DFPExtras.h"

@interface ANAdAdapterBannerDFP ()
@property (nonatomic, readwrite, strong) DFPBannerView *dfpBanner;
Expand Down Expand Up @@ -98,7 +97,7 @@ - (GADRequest *)createRequestFromTargetingParameters:(ANTARGETINGPARAMETERS *)ta
accuracy:location.horizontalAccuracy];
}

DFPExtras *extras = [DFPExtras new];
GADExtras *extras = [[GADExtras alloc] init];
NSMutableDictionary *extrasDictionary = [targetingParameters.customKeywords mutableCopy];

NSString *age = targetingParameters.age;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#import "ANBasicConfig.h"
#import ANCUSTOMADAPTERHEADER
#import "GADInterstitial.h"
#import <GoogleMobileAds/GoogleMobileAds.h>

@interface ANAdAdapterInterstitialAdMob : NSObject <ANCUSTOMADAPTERINTERSTITIAL, GADInterstitialDelegate>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#import "ANAdAdapterInterstitialAdMob.h"
#import "ANLogging.h"
#import "GADAdMobExtras.h"

@interface ANAdAdapterInterstitialAdMob ()

Expand Down Expand Up @@ -80,7 +79,7 @@ - (GADRequest *)createRequestFromTargetingParameters:(ANTARGETINGPARAMETERS *)ta
accuracy:location.horizontalAccuracy];
}

GADAdMobExtras *extras = [GADAdMobExtras new];
GADExtras *extras = [[GADExtras alloc] init];
extras.additionalParameters = targetingParameters.customKeywords;
[request registerAdNetworkExtras:extras];

Expand Down
Loading

0 comments on commit af94a6a

Please sign in to comment.