From e326de56531d55f195696b052ccff64c0c80ab59 Mon Sep 17 00:00:00 2001 From: Valentin Petrovych Date: Mon, 3 Jun 2024 13:29:02 +0200 Subject: [PATCH] fix: interstitial ad format for full screen ad units #757 --- .../src/main/java/org/prebid/mobile/InterstitialAdUnit.java | 1 + .../main/java/org/prebid/mobile/RewardedVideoAdUnit.java | 1 + .../org/prebid/mobile/api/rendering/InterstitialAdUnit.java | 2 ++ .../org/prebid/mobile/api/rendering/RewardedAdUnit.java | 6 +++++- .../test/java/org/prebid/mobile/AdUnitSuccessorTest.java | 4 ++-- .../prebid/mobile/api/rendering/InterstitialAdUnitTest.java | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/InterstitialAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/InterstitialAdUnit.java index 7e8d2f145..e8ba74f90 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/InterstitialAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/InterstitialAdUnit.java @@ -47,6 +47,7 @@ public InterstitialAdUnit(@NonNull String configId, int minWidthPerc, int minHei public InterstitialAdUnit(@NonNull String configId, EnumSet adUnitFormats) { super(configId, AdFormat.fromSet(adUnitFormats, true)); + configuration.addAdFormat(AdFormat.INTERSTITIAL); if (adUnitFormats.contains(AdUnitFormat.VIDEO)) { configuration.setAdPosition(AdPosition.FULLSCREEN); configuration.setPlacementType(PlacementType.INTERSTITIAL); diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/RewardedVideoAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/RewardedVideoAdUnit.java index 12d18039a..04e07ccba 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/RewardedVideoAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/RewardedVideoAdUnit.java @@ -28,6 +28,7 @@ public class RewardedVideoAdUnit extends VideoBaseAdUnit { public RewardedVideoAdUnit(@NonNull String configId) { super(configId, EnumSet.of(AdFormat.VAST)); + configuration.addAdFormat(AdFormat.INTERSTITIAL); configuration.setRewarded(true); configuration.setAdPosition(AdPosition.FULLSCREEN); configuration.setPlacementType(PlacementType.INTERSTITIAL); diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/InterstitialAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/InterstitialAdUnit.java index 93f79fe90..3111f9acf 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/InterstitialAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/InterstitialAdUnit.java @@ -26,6 +26,7 @@ import org.prebid.mobile.AdSize; import org.prebid.mobile.LogUtil; +import org.prebid.mobile.api.data.AdFormat; import org.prebid.mobile.api.data.AdUnitFormat; import org.prebid.mobile.api.exceptions.AdException; import org.prebid.mobile.api.rendering.listeners.InterstitialAdUnitListener; @@ -114,6 +115,7 @@ public InterstitialAdUnit( AdUnitConfiguration adUnitConfiguration = new AdUnitConfiguration(); adUnitConfiguration.setConfigId(configId); adUnitConfiguration.setAdUnitFormats(adUnitFormats); + adUnitConfiguration.addAdFormat(AdFormat.INTERSTITIAL); init(adUnitConfiguration); } diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/RewardedAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/RewardedAdUnit.java index 5c75672c1..d118f4d08 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/RewardedAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/RewardedAdUnit.java @@ -17,7 +17,9 @@ package org.prebid.mobile.api.rendering; import android.content.Context; + import androidx.annotation.Nullable; + import org.prebid.mobile.LogUtil; import org.prebid.mobile.api.data.AdFormat; import org.prebid.mobile.api.exceptions.AdException; @@ -28,6 +30,8 @@ import org.prebid.mobile.rendering.bidding.interfaces.StandaloneRewardedVideoEventHandler; import org.prebid.mobile.rendering.bidding.listeners.RewardedVideoEventListener; +import java.util.EnumSet; + public class RewardedAdUnit extends BaseInterstitialAdUnit { private static final String TAG = RewardedAdUnit.class.getSimpleName(); @@ -109,7 +113,7 @@ public RewardedAdUnit( AdUnitConfiguration adUnitConfiguration = new AdUnitConfiguration(); adUnitConfiguration.setConfigId(configId); - adUnitConfiguration.setAdFormat(AdFormat.VAST); + adUnitConfiguration.setAdFormats(EnumSet.of(AdFormat.INTERSTITIAL, AdFormat.VAST)); adUnitConfiguration.setRewarded(true); init(adUnitConfiguration); diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/AdUnitSuccessorTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/AdUnitSuccessorTest.java index 27f7e5499..be9c8f42c 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/AdUnitSuccessorTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/AdUnitSuccessorTest.java @@ -157,7 +157,7 @@ public void testVideoInterstitialAdUnitCreation() { AdUnitConfiguration configuration = (AdUnitConfiguration) adUnit.getConfiguration(); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(EnumSet.of(AdFormat.VAST), configuration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.INTERSTITIAL, AdFormat.VAST), configuration.getAdFormats()); } @Test @@ -165,7 +165,7 @@ public void testRewardedVideoAdUnitCreation() { RewardedVideoAdUnit adUnit = new RewardedVideoAdUnit(testConfigId); AdUnitConfiguration configuration = adUnit.getConfiguration(); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(EnumSet.of(AdFormat.VAST), configuration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.INTERSTITIAL, AdFormat.VAST), configuration.getAdFormats()); } @Test diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/api/rendering/InterstitialAdUnitTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/api/rendering/InterstitialAdUnitTest.java index 1c22daf12..bc38ceff2 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/api/rendering/InterstitialAdUnitTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/api/rendering/InterstitialAdUnitTest.java @@ -139,7 +139,7 @@ public void createInterstitialAdUnitNoEventHandler_InstanceCreatedStandaloneEven assertNotNull(interstitialAdUnit); assertTrue(eventHandler instanceof StandaloneInterstitialEventHandler); assertNotNull(bidLoader); - assertEquals(EnumSet.of(AdFormat.VAST), interstitialAdUnit.adUnitConfig.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.INTERSTITIAL, AdFormat.VAST), interstitialAdUnit.adUnitConfig.getAdFormats()); } @Test