Merge branch 'master' of github.com:mopub/mopub-android-mediation

Author: RossRothenstine

AdMob/CHANGELOG.md

@@ -1,4 +1,7 @@
 ## Changelog
+  * 17.0.0.2
+    * Add a null check when calling AdMob's `isLoaded()` for rewarded video ads.
+    
   * 17.0.0.1
     * Fix a bug where AdMob's native ads disappear when scrolling through a ListView/RecyclerView using MoPub's Ad Placer technology.
 

AdMob/com/mopub/mobileads/GooglePlayServicesRewardedVideo.java

@@ -175,7 +175,7 @@ protected void loadWithSdkInitialized(@NonNull Activity activity,
         new Handler(Looper.getMainLooper()).post(new Runnable() {
             @Override
             public void run() {
-                if (mRewardedVideoAd.isLoaded()) {
+                if (mRewardedVideoAd != null && mRewardedVideoAd.isLoaded()) {
                     MoPubRewardedVideoManager
                             .onRewardedVideoLoadSuccess(GooglePlayServicesRewardedVideo.class, mAdUnitId);
                 } else {

FacebookAudienceNetwork/CHANGELOG.md

@@ -1,4 +1,9 @@
 ## Changelog
+
+  * 5.1.0.0
+    * This version of the adapters has been certified with Facebook Audience Network 5.1.0
+    * For all ad formats, add support to initialize Facebook Audience Network SDK at the time of the first ad request to Facebook Audience Network.
+ 
   * 5.0.1.0
     * This version of the adapters has been certified with Facebook Audience Network 5.0.1.
 

FacebookAudienceNetwork/com/mopub/mobileads/FacebookBanner.java

@@ -11,17 +11,20 @@
 import com.facebook.ads.AdSettings;
 import com.facebook.ads.AdSize;
 import com.facebook.ads.AdView;
+import com.facebook.ads.AudienceNetworkAds;
 import com.mopub.common.DataKeys;
 import com.mopub.common.MoPub;
 import com.mopub.common.logging.MoPubLog;
 import com.mopub.common.util.Views;
 
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class FacebookBanner extends CustomEventBanner implements AdListener {
     private static final String PLACEMENT_ID_KEY = "placement_id";
     private AdView mFacebookBanner;
     private CustomEventBannerListener mBannerListener;
+    private static AtomicBoolean sIsInitialized = new AtomicBoolean(false);
 
     /**
      * CustomEventBanner implementation
@@ -32,7 +35,9 @@ protected void loadBanner(final Context context,
                               final CustomEventBannerListener customEventBannerListener,
                               final Map<String, Object> localExtras,
                               final Map<String, String> serverExtras) {
-
+        if(!sIsInitialized.getAndSet(true)) {
+            AudienceNetworkAds.initialize(context);
+        }
         setAutomaticImpressionAndClickTracking(false);
 
         mBannerListener = customEventBannerListener;

FacebookAudienceNetwork/com/mopub/mobileads/FacebookInterstitial.java

@@ -8,13 +8,15 @@
 import com.facebook.ads.Ad;
 import com.facebook.ads.AdError;
 import com.facebook.ads.AdSettings;
+import com.facebook.ads.AudienceNetworkAds;
 import com.facebook.ads.InterstitialAd;
 import com.facebook.ads.InterstitialAdListener;
 import com.mopub.common.DataKeys;
 import com.mopub.common.MoPub;
 import com.mopub.common.logging.MoPubLog;
 
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import static com.mopub.mobileads.MoPubErrorCode.EXPIRED;
 
@@ -26,6 +28,7 @@ public class FacebookInterstitial extends CustomEventInterstitial implements Int
     @NonNull
     private Handler mHandler;
     private Runnable mAdExpiration;
+    private static AtomicBoolean sIsInitialized = new AtomicBoolean(false);
 
     public FacebookInterstitial() {
         mHandler = new Handler();
@@ -53,7 +56,9 @@ protected void loadInterstitial(final Context context,
                                     final CustomEventInterstitialListener customEventInterstitialListener,
                                     final Map<String, Object> localExtras,
                                     final Map<String, String> serverExtras) {
-
+        if(!sIsInitialized.getAndSet(true)) {
+            AudienceNetworkAds.initialize(context);
+        }
         setAutomaticImpressionAndClickTracking(false);
 
         MoPubLog.d("Loading Facebook interstitial");

FacebookAudienceNetwork/com/mopub/mobileads/FacebookRewardedVideo.java

@@ -9,6 +9,7 @@
 import com.facebook.ads.Ad;
 import com.facebook.ads.AdError;
 import com.facebook.ads.AdSettings;
+import com.facebook.ads.AudienceNetworkAds;
 import com.facebook.ads.RewardedVideoAd;
 import com.facebook.ads.RewardedVideoAdListener;
 import com.mopub.common.DataKeys;
@@ -18,6 +19,7 @@
 import com.mopub.common.logging.MoPubLog;
 
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import static com.mopub.mobileads.MoPubErrorCode.EXPIRED;
 
@@ -31,6 +33,7 @@ public class FacebookRewardedVideo extends CustomEventRewardedVideo implements R
     @NonNull
     private Handler mHandler;
     private Runnable mAdExpiration;
+    private static AtomicBoolean sIsInitialized = new AtomicBoolean(false);
 
     public FacebookRewardedVideo() {
         mHandler = new Handler();
@@ -57,8 +60,11 @@ protected LifecycleListener getLifecycleListener() {
 
     @Override
     protected boolean checkAndInitializeSdk(@NonNull Activity launcherActivity, @NonNull Map<String, Object> localExtras, @NonNull Map<String, String> serverExtras) throws Exception {
-        // Facebook doesn't have a dedicated initialization call, so we return false and do nothing.
-        return false;
+        boolean requiresInitialization = !sIsInitialized.getAndSet(true);
+        if(requiresInitialization) {
+            AudienceNetworkAds.initialize(launcherActivity);
+        }
+        return requiresInitialization;
     }
 
     @Override

FacebookAudienceNetwork/com/mopub/nativeads/FacebookNative.java

@@ -8,6 +8,7 @@
 import com.facebook.ads.Ad;
 import com.facebook.ads.AdError;
 import com.facebook.ads.AdIconView;
+import com.facebook.ads.AudienceNetworkAds;
 import com.facebook.ads.MediaView;
 import com.facebook.ads.NativeAd;
 import com.facebook.ads.NativeAdListener;
@@ -19,6 +20,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * FacebookAdRenderer is also necessary in order to show video ads.
@@ -28,6 +30,7 @@
  */
 public class FacebookNative extends CustomEventNative {
     private static final String PLACEMENT_ID_KEY = "placement_id";
+    private static AtomicBoolean sIsInitialized = new AtomicBoolean(false);
 
     // CustomEventNative implementation
     @Override
@@ -36,6 +39,9 @@ protected void loadNativeAd(final Context context,
                                 final Map<String, Object> localExtras,
                                 final Map<String, String> serverExtras) {
 
+        if(!sIsInitialized.getAndSet(true)) {
+            AudienceNetworkAds.initialize(context);
+        }
         final String placementId;
         if (extrasAreValid(serverExtras)) {
             placementId = serverExtras.get(PLACEMENT_ID_KEY);

Vungle/CHANGELOG.md

@@ -1,4 +1,8 @@
 ## Changelog
+  * 6.3.24.0
+    * This version of the adapters has been certified with Vungle 6.3.24.
+    * Check if the passed Placement ID is a valid placement for the given App ID.
+
   * 6.3.17.1
     * Update the placement ID returned in the `getAdNetworkId` API (used to generate server-side rewarded video callback URL) to be non-null, and avoid potential NullPointerExceptions.
 
@@ -19,4 +23,4 @@
     * This version of the adapters has been certified with Vungle 5.3.2.
 
   * Initial Commit
-  	* Adapters moved from [mopub-android-sdk](https://github.com/mopub/mopub-android-sdk) to [mopub-android-mediation](https://github.com/mopub/mopub-android-mediation/)
+  	* Adapters moved from [mopub-android-sdk](https://github.com/mopub/mopub-android-sdk) to [mopub-android-mediation](https://github.com/mopub/mopub-android-mediation/)

Vungle/com/mopub/mobileads/VungleInterstitial.java

@@ -49,9 +49,9 @@ public VungleInterstitial() {
 
     @Override
     protected void loadInterstitial(Context context,
-            CustomEventInterstitialListener customEventInterstitialListener,
-            Map<String, Object> localExtras,
-            Map<String, String> serverExtras) {
+                                    CustomEventInterstitialListener customEventInterstitialListener,
+                                    Map<String, Object> localExtras,
+                                    Map<String, String> serverExtras) {
         mCustomEventInterstitialListener = customEventInterstitialListener;
         mIsPlaying = false;
 
@@ -147,6 +147,12 @@ private boolean validateIdsInServerExtras(Map<String, String> serverExtras) {
             isAllDataValid = false;
         }
 
+        if (serverExtras.containsKey(PLACEMENT_IDS_KEY)) {
+            MoPubLog.w(INTERSTITIAL_TAG + "No need to set placement IDs " +
+                    "in MoPub dashboard with Vungle SDK version " +
+                    com.vungle.warren.BuildConfig.VERSION_NAME);
+        }
+
         return isAllDataValid;
     }
 

Vungle/com/mopub/mobileads/VungleRewardedVideo.java

@@ -108,7 +108,12 @@ protected void loadWithSdkInitialized(@NonNull final Activity activity, @NonNull
         }
 
         if (sVungleRouter.isVungleInitialized()) {
-            sVungleRouter.loadAdForPlacement(mPlacementId, mVungleRewardedRouterListener);
+            if (sVungleRouter.isValidPlacement(mPlacementId)) {
+                sVungleRouter.loadAdForPlacement(mPlacementId, mVungleRewardedRouterListener);
+            } else {
+                MoPubLog.d(REWARDED_TAG + "Invalid or Inactive Placement ID: " + mPlacementId);
+                MoPubRewardedVideoManager.onRewardedVideoLoadFailure(VungleRewardedVideo.class, mPlacementId, MoPubErrorCode.ADAPTER_CONFIGURATION_ERROR);
+            }
         } else {
             MoPubLog.d(REWARDED_TAG + "There should not be this case. loadWithSdkInitialized is called before the SDK starts initialization for Placement ID: " + mPlacementId);
             MoPubRewardedVideoManager.onRewardedVideoLoadFailure(VungleRewardedVideo.class, mPlacementId, MoPubErrorCode.ADAPTER_CONFIGURATION_ERROR);