feat(multi-format): fix internal app #393

prebid · Mar 28, 2022 · 4672006 · 4672006
1 parent c724ef8
commit 4672006
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 57 deletions.
diff --git a/...va/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobInterstitialFragment.kt b/...va/org/prebid/mobile/renderingtestapp/plugplay/bidding/admob/AdMobInterstitialFragment.kt
@@ -18,6 +18,7 @@ import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat
 import org.prebid.mobile.renderingtestapp.AdFragment
 import org.prebid.mobile.renderingtestapp.R
 import org.prebid.mobile.renderingtestapp.plugplay.config.AdConfiguratorDialogFragment
+import java.util.*
 
 open class AdMobInterstitialFragment : AdFragment() {
 
@@ -47,8 +48,8 @@ open class AdMobInterstitialFragment : AdFragment() {
         val mediationUtils = AdMobInterstitialMediationUtils(extras)
 
         isVideo = arguments?.getBoolean(ARG_IS_VIDEO) ?: false
-        var adUnitFormat = AdUnitFormat.DISPLAY
-        if (isVideo) adUnitFormat = AdUnitFormat.VIDEO
+        var adUnitFormat = EnumSet.of(AdUnitFormat.DISPLAY)
+        if (isVideo) adUnitFormat = EnumSet.of(AdUnitFormat.VIDEO)
         adUnit = MediationInterstitialAdUnit(activity, configId, adUnitFormat, mediationUtils)
         if (!isVideo) {
             adUnit?.setMinSizePercentage(30, 30)

diff --git a/.../prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamBannersAndInterstitialFragment.kt b/.../prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamBannersAndInterstitialFragment.kt
@@ -36,8 +36,12 @@ class GamBannersAndInterstitialFragment : PpmBannersWithInterstitialFragment() {
     }
 
     override fun initInterstitialAdUnit(configId: String): InterstitialAdUnit {
-        val eventHandler = GamInterstitialEventHandler(requireActivity(), getString(R.string.adunit_gam_interstitial_320_480_app_event))
-        val interstitialAdUnit = InterstitialAdUnit(requireContext(), configId, AdSize(30, 30), eventHandler)
+        val eventHandler = GamInterstitialEventHandler(
+            requireActivity(),
+            getString(R.string.adunit_gam_interstitial_320_480_app_event)
+        )
+        val interstitialAdUnit = InterstitialAdUnit(requireContext(), configId, eventHandler)
+        interstitialAdUnit.setMinSizePercentage(AdSize(30, 30))
         interstitialAdUnit.setInterstitialAdUnitListener(getInterstitialAdListener())
         interstitialAdUnit.loadAd()
         return interstitialAdUnit

diff --git a/...n/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamInterstitialFragment.kt b/...n/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamInterstitialFragment.kt
@@ -21,15 +21,18 @@ import org.prebid.mobile.eventhandlers.GamInterstitialEventHandler
 import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat
 import org.prebid.mobile.rendering.bidding.parallel.InterstitialAdUnit
 import org.prebid.mobile.renderingtestapp.plugplay.bidding.base.BaseBidInterstitialFragment
+import java.util.*
 
 open class GamInterstitialFragment : BaseBidInterstitialFragment() {
     override fun initInterstitialAd(adUnitFormat: AdUnitFormat, adUnitId: String?, configId: String?, width: Int, height: Int) {
         val interstitialEventHandler = GamInterstitialEventHandler(requireActivity(), adUnitId)
         interstitialAdUnit = if (adUnitFormat == AdUnitFormat.VIDEO){
-            InterstitialAdUnit(requireContext(), configId, adUnitFormat, interstitialEventHandler)
+            InterstitialAdUnit(requireContext(), configId, EnumSet.of(adUnitFormat), interstitialEventHandler)
         }
         else {
-            InterstitialAdUnit(requireContext(), configId, AdSize(width, height), interstitialEventHandler)
+            InterstitialAdUnit(requireContext(), configId, interstitialEventHandler).apply {
+                setMinSizePercentage(AdSize(width, height))
+            }
         }
 
         interstitialAdUnit?.setInterstitialAdUnitListener(this)

diff --git a/...id/mobile/renderingtestapp/plugplay/bidding/mopub/MopubBannersWithInterstitialFragment.kt b/...id/mobile/renderingtestapp/plugplay/bidding/mopub/MopubBannersWithInterstitialFragment.kt
@@ -35,6 +35,7 @@ import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat
 import org.prebid.mobile.renderingtestapp.R
 import org.prebid.mobile.renderingtestapp.plugplay.bidding.base.BaseBannersWithInterstitialFragment
 import org.prebid.mobile.renderingtestapp.utils.getAdDescription
+import java.util.*
 
 class MopubBannersWithInterstitialFragment : BaseBannersWithInterstitialFragment() {
 
@@ -64,7 +65,7 @@ class MopubBannersWithInterstitialFragment : BaseBannersWithInterstitialFragment
             MediationInterstitialAdUnit(
                 requireContext(),
                 interstitialConfigId,
-                AdUnitFormat.DISPLAY,
+                EnumSet.of(AdUnitFormat.DISPLAY),
                 mediationUtils
             )
         mediationInterstitialAdUnit?.setMinSizePercentage(30, 30)

diff --git a/...va/org/prebid/mobile/renderingtestapp/plugplay/bidding/mopub/MopubInterstitialFragment.kt b/...va/org/prebid/mobile/renderingtestapp/plugplay/bidding/mopub/MopubInterstitialFragment.kt
@@ -30,6 +30,7 @@ import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat
 import org.prebid.mobile.renderingtestapp.AdFragment
 import org.prebid.mobile.renderingtestapp.R
 import org.prebid.mobile.renderingtestapp.plugplay.config.AdConfiguratorDialogFragment
+import java.util.*
 
 class MopubInterstitialFragment : AdFragment() {
 
@@ -105,14 +106,14 @@ class MopubInterstitialFragment : AdFragment() {
             MediationInterstitialAdUnit(
                 requireContext(),
                 configId,
-                AdUnitFormat.VIDEO,
+                EnumSet.of(AdUnitFormat.VIDEO),
                 mediationUtils
             )
         } else {
             MediationInterstitialAdUnit(
                 requireContext(),
                 configId,
-                AdUnitFormat.DISPLAY,
+                EnumSet.of(AdUnitFormat.DISPLAY),
                 mediationUtils
             )
         }

diff --git a/...prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmBannersWithInterstitialFragment.kt b/...prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmBannersWithInterstitialFragment.kt
@@ -67,7 +67,8 @@ open class PpmBannersWithInterstitialFragment : BaseBannersWithInterstitialFragm
     }
 
     open fun initInterstitialAdUnit(configId: String): InterstitialAdUnit {
-        val interstitialAdUnit = InterstitialAdUnit(requireContext(), configId, AdSize(30, 30))
+        val interstitialAdUnit = InterstitialAdUnit(requireContext(), configId)
+        interstitialAdUnit.setMinSizePercentage(AdSize(30, 30))
         interstitialAdUnit.setInterstitialAdUnitListener(getInterstitialAdListener())
         return interstitialAdUnit
     }

diff --git a/...n/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmInterstitialFragment.kt b/...n/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmInterstitialFragment.kt
@@ -16,19 +16,19 @@
 
 package org.prebid.mobile.renderingtestapp.plugplay.bidding.ppm
 
-import org.prebid.mobile.AdSize
 import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat
 import org.prebid.mobile.rendering.bidding.parallel.InterstitialAdUnit
 import org.prebid.mobile.renderingtestapp.plugplay.bidding.base.BaseBidInterstitialFragment
+import java.util.*
 
 open class PpmInterstitialFragment : BaseBidInterstitialFragment() {
     override fun initInterstitialAd(adUnitFormat: AdUnitFormat, adUnitId: String?,
                                     configId: String?, width: Int, height: Int) {
         interstitialAdUnit = if (adUnitFormat == AdUnitFormat.VIDEO){
-            InterstitialAdUnit(requireContext(), configId, adUnitFormat)
+            InterstitialAdUnit(requireContext(), configId, EnumSet.of(adUnitFormat))
         }
         else {
-            InterstitialAdUnit(requireContext(), configId, AdSize(width, height))
+            InterstitialAdUnit(requireContext(), configId)
         }
         interstitialAdUnit?.setInterstitialAdUnitListener(this)
     }

diff --git a/...dMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java b/...dMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java
@@ -219,19 +219,31 @@ public int getVideoSkipOffset() {
     }
 
     public void addAdFormat(@Nullable AdFormat adFormat) {
+        if (adFormat == null) return;
+
+        if (adFormat == AdFormat.NATIVE) {
+            nativeConfiguration = new NativeAdUnitConfiguration();
+        }
+
         adFormats.add(adFormat);
     }
 
+    /**
+     * Clears ad formats list and adds only one ad format.
+     */
     public void setAdFormat(@Nullable AdFormat adFormat) {
+        if (adFormat == null) return;
+
         if (adFormat == AdFormat.NATIVE) {
             nativeConfiguration = new NativeAdUnitConfiguration();
         }
+
         adFormats.clear();
         adFormats.add(adFormat);
     }
 
     /**
-     * Adds AdFormats corresponding to AdUnitFormat types.
+     * Clears previous ad formats and adds AdFormats corresponding to AdUnitFormat types.
      */
     public void setAdFormats(@Nullable EnumSet<AdUnitFormat> adUnitFormats) {
         if (adUnitFormats == null) return;

diff --git a/...Mobile-core/src/test/java/org/prebid/mobile/rendering/models/AdUnitConfigurationTest.java b/...Mobile-core/src/test/java/org/prebid/mobile/rendering/models/AdUnitConfigurationTest.java