diff --git a/Example/PrebidDemoJava/src/main/java/org/prebid/mobile/javademo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNative.java b/Example/PrebidDemoJava/src/main/java/org/prebid/mobile/javademo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNative.java index ca04c7c33..b0077e912 100644 --- a/Example/PrebidDemoJava/src/main/java/org/prebid/mobile/javademo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNative.java +++ b/Example/PrebidDemoJava/src/main/java/org/prebid/mobile/javademo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNative.java @@ -77,7 +77,7 @@ private void createAd() { prebidRequest.setNativeParameters(creativeNativeParameters()); AdManagerAdRequest gamRequest = new AdManagerAdRequest.Builder().build(); - prebidAdUnit.fetchDemand(prebidRequest, gamRequest, bidInfo -> { + prebidAdUnit.fetchDemand(gamRequest, prebidRequest, bidInfo -> { loadGam(gamRequest); }); } diff --git a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNativeActivity.kt b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNativeActivity.kt index 4f3622582..9413757ce 100644 --- a/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNativeActivity.kt +++ b/Example/PrebidDemoKotlin/src/main/java/org/prebid/mobile/prebidkotlindemo/activities/ads/gam/original/GamOriginalApiMultiformatBannerVideoNativeActivity.kt @@ -61,7 +61,7 @@ class GamOriginalApiMultiformatBannerVideoNativeActivity : BaseAdActivity() { prebidRequest.setNativeParameters(createNativeParameters()) val gamRequest = AdManagerAdRequest.Builder().build() - prebidAdUnit?.fetchDemand(prebidRequest, gamRequest) { + prebidAdUnit?.fetchDemand(gamRequest, prebidRequest) { loadGam(gamRequest) } } diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeFragment.kt index e22d88d18..c84933bc0 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeFragment.kt @@ -103,7 +103,7 @@ open class GamOriginalMultiformatBannerVideoNativeFragment : AdFragment() { prebidAdUnit = PrebidAdUnit(configId) val gamRequest = AdManagerAdRequest.Builder().build() - prebidAdUnit?.fetchDemand(prebidRequest, gamRequest) { + prebidAdUnit?.fetchDemand(gamRequest, prebidRequest) { loadGam(gamRequest) } } diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeStylesFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeStylesFragment.kt index 485cbe5ee..5f61714c4 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeStylesFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatBannerVideoNativeStylesFragment.kt @@ -89,7 +89,7 @@ open class GamOriginalMultiformatBannerVideoNativeStylesFragment : AdFragment() prebidAdUnit = PrebidAdUnit(configId) val gamRequest = AdManagerAdRequest.Builder().build() - prebidAdUnit?.fetchDemand(prebidRequest, gamRequest) { + prebidAdUnit?.fetchDemand(gamRequest, prebidRequest) { loadGam(gamRequest) } } diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatInterstitialFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatInterstitialFragment.kt index 671881acc..7e96916cf 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatInterstitialFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatInterstitialFragment.kt @@ -62,7 +62,7 @@ open class GamOriginalMultiformatInterstitialFragment : BaseBidInterstitialFragm prebidAdUnit = PrebidAdUnit(getCurrentConfigId()) val gamRequest = AdManagerAdRequest.Builder().build() - prebidAdUnit?.fetchDemand(createPrebidRequest(), gamRequest) { + prebidAdUnit?.fetchDemand(gamRequest, createPrebidRequest()) { AdManagerInterstitialAd.load( requireContext(), adUnitId, diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatRewardedFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatRewardedFragment.kt index c7b406f93..4e9f94eb2 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatRewardedFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/original/GamOriginalMultiformatRewardedFragment.kt @@ -57,7 +57,7 @@ open class GamOriginalMultiformatRewardedFragment : BaseBidInterstitialFragment( prebidAdUnit = PrebidAdUnit(configId) val gamRequest = AdManagerAdRequest.Builder().build() - prebidAdUnit?.fetchDemand(createPrebidRequest(), gamRequest) { + prebidAdUnit?.fetchDemand(gamRequest, createPrebidRequest()) { RewardedAd.load( requireContext(), adUnitId, diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java index c7894728a..3e06c5582 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java @@ -124,7 +124,7 @@ public void fetchDemand(@NonNull final OnCompleteListener2 listener) { }); } - public void fetchDemand(@Nullable Object adObj, @NonNull OnCompleteListener listener) { + public void fetchDemand(Object adObj, @NonNull OnCompleteListener listener) { if (TextUtils.isEmpty(PrebidMobile.getPrebidServerAccountId())) { LogUtil.error("Empty account id."); listener.onComplete(ResultCode.INVALID_ACCOUNT_ID); diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/data/BidInfo.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/data/BidInfo.java index ed3c09589..a05309bdf 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/data/BidInfo.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/data/BidInfo.java @@ -16,7 +16,7 @@ public class BidInfo { @Nullable private String nativeCacheId; @Nullable - private Integer expirationTimeSeconds; + private Integer exp; public BidInfo( @NonNull ResultCode resultCode, @@ -31,7 +31,7 @@ public void setNativeResult( Integer expirationTimeSeconds ) { this.nativeCacheId = nativeCacheId; - this.expirationTimeSeconds = expirationTimeSeconds; + this.exp = expirationTimeSeconds; } @NonNull @@ -50,8 +50,8 @@ public String getNativeCacheId() { } @Nullable - public Integer getExpirationTimeSeconds() { - return expirationTimeSeconds; + public Integer getExp() { + return exp; } } diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/original/PrebidAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/original/PrebidAdUnit.java index ccf5ff9c1..12681b0e6 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/original/PrebidAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/original/PrebidAdUnit.java @@ -30,8 +30,8 @@ public void fetchDemand( } public void fetchDemand( - PrebidRequest request, Object adObject, + PrebidRequest request, OnFetchDemandResult listener ) { baseFetchDemand(request, adObject, listener); diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/api/original/OnCompleteListenerImplTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/api/original/OnCompleteListenerImplTest.java index 03e047b16..a1665ab28 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/api/original/OnCompleteListenerImplTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/api/original/OnCompleteListenerImplTest.java @@ -64,7 +64,7 @@ public void emptyBidResponse() { assertNotNull(bidInfo); assertEquals(ResultCode.NO_BIDS, bidInfo.getResultCode()); assertNull(bidInfo.getNativeCacheId()); - assertNull(bidInfo.getExpirationTimeSeconds()); + assertNull(bidInfo.getExp()); assertNull(bidInfo.getTargetingKeywords()); } @@ -93,7 +93,7 @@ public void fullBidResponse() { assertEquals(ResultCode.SUCCESS, bidInfo.getResultCode()); assertEquals(keywords, bidInfo.getTargetingKeywords()); assertNull(bidInfo.getNativeCacheId()); - assertNull(bidInfo.getExpirationTimeSeconds()); + assertNull(bidInfo.getExp()); } @Test @@ -122,7 +122,7 @@ public void fullBidResponseWithNative() { assertNotNull(bidInfo); assertEquals(ResultCode.SUCCESS, bidInfo.getResultCode()); assertEquals(keywords, bidInfo.getTargetingKeywords()); - assertEquals(Integer.valueOf(300), bidInfo.getExpirationTimeSeconds()); + assertEquals(Integer.valueOf(300), bidInfo.getExp()); } } \ No newline at end of file