diff --git a/Example/PrebidInternalTestApp/src/androidTest/java/org/prebid/mobile/renderingtestapp/uiAutomator/pages/bidding/gam/GamInterstitialPage.java b/Example/PrebidInternalTestApp/src/androidTest/java/org/prebid/mobile/renderingtestapp/uiAutomator/pages/bidding/gam/GamInterstitialPage.java index 7320f4503..6406568cc 100644 --- a/Example/PrebidInternalTestApp/src/androidTest/java/org/prebid/mobile/renderingtestapp/uiAutomator/pages/bidding/gam/GamInterstitialPage.java +++ b/Example/PrebidInternalTestApp/src/androidTest/java/org/prebid/mobile/renderingtestapp/uiAutomator/pages/bidding/gam/GamInterstitialPage.java @@ -16,6 +16,11 @@ package org.prebid.mobile.renderingtestapp.uiAutomator.pages.bidding.gam; +import org.prebid.mobile.renderingtestapp.uiAutomator.pages.AdBasePage; +import org.prebid.mobile.renderingtestapp.uiAutomator.utils.WebViewLocator; + +import java.util.concurrent.TimeUnit; + import androidx.test.espresso.web.webdriver.Locator; import androidx.test.uiautomator.By; import androidx.test.uiautomator.BySelector; @@ -23,11 +28,6 @@ import androidx.test.uiautomator.UiObject2; import androidx.test.uiautomator.Until; -import org.prebid.mobile.renderingtestapp.uiAutomator.pages.AdBasePage; -import org.prebid.mobile.renderingtestapp.uiAutomator.utils.WebViewLocator; - -import java.util.concurrent.TimeUnit; - import static org.junit.Assert.assertTrue; public class GamInterstitialPage extends AdBasePage { @@ -35,7 +35,7 @@ public class GamInterstitialPage extends AdBasePage { public static final int VIDEO_DURATION_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(20); private static class Locators { - static BySelector oxbVideoCreative = By.res(TAG, "exo_content_frame"); + static BySelector prebidVideoCreative = By.res(TAG, "exo_content_frame"); static WebViewLocator gamVideoCreative = new WebViewLocator(Locator.ID, "adContainer"); static BySelector prebidHtmlCreative = getWebViewSelectorVersionDepends("www.openx"); @@ -58,13 +58,13 @@ public GamInterstitialPage gamOrPrebidHtmlCreativeShouldBePresent() { public GamInterstitialPage gamOrPrebidVideoCreativeShouldBePresent() { boolean isCreativePresent = getGamVideoCreative() != null - || getUiObject(Locators.oxbVideoCreative) != null; + || getUiObject(Locators.prebidVideoCreative) != null; assertTrue("Interstitial is not displayed", isCreativePresent); return this; } /** - * Click is performed on top right corner after video duration delay in order to work with GAM and OXB end cards. + * Click is performed on top right corner after video duration delay in order to work with GAM and prebid end cards. */ public GamInterstitialPage closeEndCard() throws InterruptedException { synchronized (device) { @@ -85,15 +85,6 @@ public GamInterstitialPage closeInterstitial() { return super.closeInterstitial(); } - public GamInterstitialPage clickInterstitial() { - final UiObject2 oxbCreative = getUiObject(Locators.prebidHtmlCreative); - BySelector creativeSelector = oxbCreative != null - ? Locators.prebidHtmlCreative - : Locators.gamHtmlCreative; - clickOnView(creativeSelector, TIMEOUT * 2); - return this; - } - @Override public GamInterstitialPage goBackOnce() { synchronized (device) { diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/base/BaseBidInterstitialFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/base/BaseBidInterstitialFragment.kt index f6eb2897f..d12ebc6a7 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/base/BaseBidInterstitialFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/base/BaseBidInterstitialFragment.kt @@ -72,8 +72,8 @@ abstract class BaseBidInterstitialFragment : AdFragment(), InterstitialAdUnitLis btnLoad?.isEnabled = true } - override fun onAdDisplayed(oxbInterstitialAdUnit: InterstitialAdUnit?) { - Log.d(TAG, "onAdDisplayed() called with: oxbInterstitialAdUnit = [$oxbInterstitialAdUnit]") + override fun onAdDisplayed(interstitialAdUnit: InterstitialAdUnit?) { + Log.d(TAG, "onAdDisplayed() called with: interstitialAdUnit = [$interstitialAdUnit]") btnAdDisplayed?.isEnabled = true } @@ -87,8 +87,8 @@ abstract class BaseBidInterstitialFragment : AdFragment(), InterstitialAdUnitLis btnAdClicked?.isEnabled = true } - override fun onAdLoaded(oxbInterstitialAdUnit: InterstitialAdUnit?) { - Log.d(TAG, "onAdLoaded() called with: oxbInterstitialAdUnit = [$oxbInterstitialAdUnit]") + override fun onAdLoaded(interstitialAdUnit: InterstitialAdUnit?) { + Log.d(TAG, "onAdLoaded() called with: interstitialAdUnit = [$interstitialAdUnit]") btnAdLoaded?.isEnabled = true btnLoad?.setText(R.string.text_show) btnLoad?.isEnabled = true diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamBannerFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamBannerFragment.kt index 3524a7b15..2ceae4d24 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamBannerFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamBannerFragment.kt @@ -51,7 +51,7 @@ open class GamBannerFragment : AdFragment(), BannerViewListener { bannerView = initBanner( configId, eventHandler) - bannerView?.addAdditionalSizes(*getAdditionalOxbBannerSizeArray()) + bannerView?.addAdditionalSizes(*getAdditionalPrebidBannerSizeArray()) bannerView?.setAutoRefreshDelay(refreshDelay) bannerView?.setBannerListener(this) viewContainer.addView(bannerView) @@ -108,5 +108,5 @@ open class GamBannerFragment : AdFragment(), BannerViewListener { protected open fun getGamAdSizeArray(initialSize: AdSize) = arrayOf(initialSize) - protected open fun getAdditionalOxbBannerSizeArray() = emptyArray() + protected open fun getAdditionalPrebidBannerSizeArray() = emptyArray() } \ No newline at end of file diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamMultisizeBannerFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamMultisizeBannerFragment.kt index 12b6c4cb6..eb0606e2a 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamMultisizeBannerFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamMultisizeBannerFragment.kt @@ -20,7 +20,7 @@ import org.prebid.mobile.rendering.bidding.data.AdSize class GamMultisizeBannerFragment : GamBannerFragment() { - override fun getAdditionalOxbBannerSizeArray() = arrayOf(AdSize(728, 90)) + override fun getAdditionalPrebidBannerSizeArray() = arrayOf(AdSize(728, 90)) override fun getGamAdSizeArray(initialSize: AdSize) = arrayOf(initialSize, AdSize(728, 90)) diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamOustreamFeedFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamOustreamFeedFragment.kt index d437c43f3..b53e768d0 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamOustreamFeedFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/gam/GamOustreamFeedFragment.kt @@ -18,10 +18,10 @@ package org.prebid.mobile.renderingtestapp.plugplay.bidding.gam import org.prebid.mobile.renderingtestapp.plugplay.bidding.base.BaseFeedFragment import org.prebid.mobile.renderingtestapp.utils.adapters.BaseFeedAdapter -import org.prebid.mobile.renderingtestapp.utils.adapters.OXBFeedGamAdapter +import org.prebid.mobile.renderingtestapp.utils.adapters.FeedGamAdapter class GamOustreamFeedFragment : BaseFeedFragment() { override fun initFeedAdapter(): BaseFeedAdapter { - return OXBFeedGamAdapter(requireContext(), width, height, configId, adUnitId) + return FeedGamAdapter(requireContext(), width, height, configId, adUnitId) } } \ No newline at end of file diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmBannerInLayoutFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmBannerInLayoutFragment.kt index 17138e7a0..616226357 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmBannerInLayoutFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmBannerInLayoutFragment.kt @@ -24,7 +24,7 @@ class PpmBannerInLayoutFragment : PpmBannerFragment() { override val layoutRes = R.layout.fragment_bidding_banner_in_layout override fun initAd(): Any? { - bannerView = oxBannerView + bannerView = prebidBannerView bannerView?.setBannerListener(this) return bannerView } diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmFeedVideoFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmFeedVideoFragment.kt index beef3fdea..26a5efb13 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmFeedVideoFragment.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/ppm/PpmFeedVideoFragment.kt @@ -19,12 +19,12 @@ package org.prebid.mobile.renderingtestapp.plugplay.bidding.ppm import org.prebid.mobile.renderingtestapp.plugplay.bidding.base.BaseFeedFragment import org.prebid.mobile.renderingtestapp.plugplay.config.AdConfiguratorDialogFragment import org.prebid.mobile.renderingtestapp.utils.adapters.BaseFeedAdapter -import org.prebid.mobile.renderingtestapp.utils.adapters.OXBFeedAdapter +import org.prebid.mobile.renderingtestapp.utils.adapters.FeedAdapter class PpmFeedVideoFragment : BaseFeedFragment() { override fun initFeedAdapter(): BaseFeedAdapter { - return OXBFeedAdapter(requireContext(), width, height, configId) + return FeedAdapter(requireContext(), width, height, configId) } override fun configuratorMode(): AdConfiguratorDialogFragment.AdConfiguratorMode? = AdConfiguratorDialogFragment.AdConfiguratorMode.BANNER diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/utilities/consent/ConsentUpdateManager.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/utilities/consent/ConsentUpdateManager.kt index 1ec85238a..5a05cbb04 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/utilities/consent/ConsentUpdateManager.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/plugplay/utilities/consent/ConsentUpdateManager.kt @@ -19,7 +19,7 @@ package org.prebid.mobile.renderingtestapp.plugplay.utilities.consent import android.content.SharedPreferences import android.util.Log import com.google.gson.Gson -import org.prebid.mobile.rendering.utils.logger.OXLog +import org.prebid.mobile.rendering.utils.logger.LogUtil import org.prebid.mobile.renderingtestapp.data.ConsentConfiguration import java.util.concurrent.Executors import java.util.concurrent.ScheduledFuture @@ -67,7 +67,7 @@ class ConsentUpdateManager(private val defaultSharedPreferences: SharedPreferenc private fun startTimer(updateIntervalSec: Long?, updateOptionsList: List>?) { if (updateIntervalSec == null || updateOptionsList == null) { - OXLog.error(TAG, "startTimer(): Failed. Provided update internal or updateOptionsList is null.") + LogUtil.error(TAG, "startTimer(): Failed. Provided update internal or updateOptionsList is null.") return } @@ -105,7 +105,7 @@ class ConsentUpdateManager(private val defaultSharedPreferences: SharedPreferenc private fun updateConsentPreferences(updateOptionsMap: Map?) { if (updateOptionsMap == null) { - OXLog.error(TAG, "updateConsentPreferences(): Failed. Provided options map is null") + LogUtil.error(TAG, "updateConsentPreferences(): Failed. Provided options map is null") return } diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/OpenRtbConfigs.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/OpenRtbConfigs.kt index eeca3ccf3..e95980a27 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/OpenRtbConfigs.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/OpenRtbConfigs.kt @@ -43,7 +43,7 @@ object OpenRtbConfigs { Targeting.setUserId(openRtbExtra.userId) } if (openRtbExtra.gender != null) { - Targeting.setUserGender(UserParameters.OXMGender.valueOf(openRtbExtra.gender)) + Targeting.setUserGender(UserParameters.Gender.valueOf(openRtbExtra.gender)) } if (openRtbExtra.buyerId != null) { Targeting.setBuyerUid(openRtbExtra.buyerId) diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/OXBFeedAdapter.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/FeedAdapter.kt similarity index 89% rename from Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/OXBFeedAdapter.kt rename to Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/FeedAdapter.kt index c1c111d6a..558672a78 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/OXBFeedAdapter.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/FeedAdapter.kt @@ -29,10 +29,10 @@ import org.prebid.mobile.rendering.bidding.parallel.BannerView private const val TAG = "FeedAdapter" -open class OXBFeedAdapter(context: Context, - val width: Int, - val height: Int, - val configId: String) : BaseFeedAdapter(context) { +open class FeedAdapter(context: Context, + val width: Int, + val height: Int, + val configId: String) : BaseFeedAdapter(context) { protected var videoView: BannerView? = null diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/OXBFeedGamAdapter.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/FeedGamAdapter.kt similarity index 88% rename from Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/OXBFeedGamAdapter.kt rename to Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/FeedGamAdapter.kt index 8ef8c8ac0..edff2c59d 100644 --- a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/OXBFeedGamAdapter.kt +++ b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/FeedGamAdapter.kt @@ -27,11 +27,11 @@ import org.prebid.mobile.rendering.bidding.enums.VideoPlacementType import org.prebid.mobile.rendering.bidding.parallel.BannerView import org.prebid.mobile.renderingtestapp.utils.OpenRtbConfigs -class OXBFeedGamAdapter(context: Context, - width: Int, - height: Int, - configId: String, - val adUnitId: String) : OXBFeedAdapter(context, width, height, configId) { +class FeedGamAdapter(context: Context, + width: Int, + height: Int, + configId: String, + val adUnitId: String) : FeedAdapter(context, width, height, configId) { override fun initAndLoadAdView(parent: ViewGroup?, container: FrameLayout): View? { val eventHandler = GamBannerEventHandler(container.context, adUnitId, diff --git a/Example/PrebidInternalTestApp/src/main/res/layout/fragment_bidding_banner_in_layout.xml b/Example/PrebidInternalTestApp/src/main/res/layout/fragment_bidding_banner_in_layout.xml index 3ac28b2fc..de8f28a75 100644 --- a/Example/PrebidInternalTestApp/src/main/res/layout/fragment_bidding_banner_in_layout.xml +++ b/Example/PrebidInternalTestApp/src/main/res/layout/fragment_bidding_banner_in_layout.xml @@ -34,7 +34,7 @@ app:layout_constraintTop_toTopOf="parent"> = MAX_SIZE) { - OXLog.error(TAG, - "Unable to cache OXBBidResponse. Please destroy some via #destroy() and try again."); + LogUtil.error(TAG, + "Unable to cache BidResponse. Please destroy some via #destroy() and try again."); return; } if (TextUtils.isEmpty(key)) { - OXLog.error(TAG, - "Unable to cache OXBBidResponse. Key is empty or null."); + LogUtil.error(TAG, + "Unable to cache BidResponse. Key is empty or null."); return; } sCachedBidResponses.put(key, response); - OXLog.debug(TAG, "Cached ad count after storing: " + getCachedResponsesCount()); + LogUtil.debug(TAG, "Cached ad count after storing: " + getCachedResponsesCount()); } @Nullable public BidResponse popBidResponse( @Nullable final String responseId) { - OXLog.debug(TAG, "POPPING the response"); + LogUtil.debug(TAG, "POPPING the response"); BidResponse bidResponse = null; @@ -111,9 +111,9 @@ public BidResponse popBidResponse( bidResponse = sCachedBidResponses.remove(responseId); } else { - OXLog.warn(TAG, "No cached ad to retrieve in the final map"); + LogUtil.warn(TAG, "No cached ad to retrieve in the final map"); } - OXLog.debug(TAG, "Cached ad count after popping: " + getCachedResponsesCount()); + LogUtil.debug(TAG, "Cached ad count after popping: " + getCachedResponsesCount()); return bidResponse; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/DisplayView.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/DisplayView.java index 9f36b75a7..d2bac00f2 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/DisplayView.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/DisplayView.java @@ -28,7 +28,7 @@ import org.prebid.mobile.rendering.networking.WinNotifier; import org.prebid.mobile.rendering.utils.broadcast.local.EventForwardingLocalBroadcastReceiver; import org.prebid.mobile.rendering.utils.constants.IntentActions; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.AdViewManager; import org.prebid.mobile.rendering.views.AdViewManagerListener; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; @@ -199,35 +199,35 @@ private void displayVideoAd(BidResponse response) throws AdException { } private void notifyListenerError(AdException e) { - OXLog.debug(TAG, "onAdFailed"); + LogUtil.debug(TAG, "onAdFailed"); if (mDisplayViewListener != null) { mDisplayViewListener.onAdFailed(e); } } private void notifyListenerClicked() { - OXLog.debug(TAG, "onAdClicked"); + LogUtil.debug(TAG, "onAdClicked"); if (mDisplayViewListener != null) { mDisplayViewListener.onAdClicked(); } } private void notifyListenerClose() { - OXLog.debug(TAG, "onAdClosed"); + LogUtil.debug(TAG, "onAdClosed"); if (mDisplayViewListener != null) { mDisplayViewListener.onAdClosed(); } } private void notifyListenerDisplayed() { - OXLog.debug(TAG, "onAdDisplayed"); + LogUtil.debug(TAG, "onAdDisplayed"); if (mDisplayViewListener != null) { mDisplayViewListener.onAdDisplayed(); } } private void notifyListenerLoaded() { - OXLog.debug(TAG, "onAdLoaded"); + LogUtil.debug(TAG, "onAdLoaded"); if (mDisplayViewListener != null) { mDisplayViewListener.onAdLoaded(); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialController.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialController.java index 172348a4d..5505e4436 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialController.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialController.java @@ -25,7 +25,7 @@ import org.prebid.mobile.rendering.models.AdConfiguration; import org.prebid.mobile.rendering.models.AdDetails; import org.prebid.mobile.rendering.networking.WinNotifier; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; public class InterstitialController { private static final String TAG = InterstitialController.class.getSimpleName(); @@ -37,7 +37,7 @@ public class InterstitialController { private final InterstitialViewListener mInterstitialViewListener = new InterstitialViewListener() { @Override public void onAdLoaded(InterstitialView interstitialView, AdDetails adDetails) { - OXLog.debug(TAG, "onAdLoaded"); + LogUtil.debug(TAG, "onAdLoaded"); if (mListener != null) { mListener.onInterstitialReadyForDisplay(); } @@ -45,7 +45,7 @@ public void onAdLoaded(InterstitialView interstitialView, AdDetails adDetails) { @Override public void onAdFailed(InterstitialView interstitialView, AdException error) { - OXLog.debug(TAG, "onAdFailed"); + LogUtil.debug(TAG, "onAdFailed"); if (mListener != null) { mListener.onInterstitialFailedToLoad(error); } @@ -53,7 +53,7 @@ public void onAdFailed(InterstitialView interstitialView, AdException error) { @Override public void onAdDisplayed(InterstitialView interstitialView) { - OXLog.debug(TAG, "onAdDisplayed"); + LogUtil.debug(TAG, "onAdDisplayed"); if (mListener != null) { mListener.onInterstitialDisplayed(); } @@ -65,7 +65,7 @@ public void onAdCompleted(InterstitialView interstitialView) { @Override public void onAdClicked(InterstitialView interstitialView) { - OXLog.debug(TAG, "onAdClicked"); + LogUtil.debug(TAG, "onAdClicked"); if (mListener != null) { mListener.onInterstitialClicked(); } @@ -78,7 +78,7 @@ public void onAdClickThroughClosed(InterstitialView interstitialView) { @Override public void onAdClosed(InterstitialView interstitialView) { - OXLog.debug(TAG, "onAdClosed"); + LogUtil.debug(TAG, "onAdClosed"); if (mListener != null) { mListener.onInterstitialClosed(); } @@ -119,7 +119,7 @@ public void loadAd(String responseId, boolean isRewarded) { public void show() { if (mAdUnitIdentifierType == null) { - OXLog.error(TAG, "show: Failed. AdUnitIdentifierType is not defined!"); + LogUtil.error(TAG, "show: Failed. AdUnitIdentifierType is not defined!"); return; } @@ -131,9 +131,9 @@ public void show() { mBidInterstitialView.showVideoAsInterstitial(); break; default: - OXLog.error(TAG, "show: Failed. Did you specify correct AdUnitConfigurationType? " - + "Supported types: VAST, INTERSTITIAL. " - + "Provided type: " + mAdUnitIdentifierType); + LogUtil.error(TAG, "show: Failed. Did you specify correct AdUnitConfigurationType? " + + "Supported types: VAST, INTERSTITIAL. " + + "Provided type: " + mAdUnitIdentifierType); } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialView.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialView.java index cf5213670..fa51f0531 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialView.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialView.java @@ -29,7 +29,7 @@ import org.prebid.mobile.rendering.models.AdDetails; import org.prebid.mobile.rendering.models.internal.InternalFriendlyObstruction; import org.prebid.mobile.rendering.utils.constants.IntentActions; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.AdViewManager; import org.prebid.mobile.rendering.views.AdViewManagerListener; import org.prebid.mobile.rendering.views.base.BaseAdView; @@ -81,7 +81,7 @@ public void creativeClicked(String url) { @Override public void creativeInterstitialClosed() { - OXLog.debug(TAG, "interstitialAdClosed"); + LogUtil.debug(TAG, "interstitialAdClosed"); handleActionClose(); } }; @@ -136,7 +136,7 @@ public void showAsInterstitialFromRoot() { mInterstitialManager.displayAdViewInInterstitial(getContext(), InterstitialView.this); } catch (final Exception e) { - OXLog.error(TAG, "Interstitial failed to show:" + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Interstitial failed to show:" + Log.getStackTraceString(e)); notifyErrorListeners(new AdException(AdException.INTERNAL_ERROR, e.getMessage())); } } @@ -153,7 +153,7 @@ public void showVideoAsInterstitial() { mInterstitialVideo.show(); } catch (final Exception e) { - OXLog.error(TAG, "Video interstitial failed to show:" + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Video interstitial failed to show:" + Log.getStackTraceString(e)); notifyErrorListeners(new AdException(AdException.INTERNAL_ERROR, e.getMessage())); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/NativeAdUnit.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/NativeAdUnit.java index 6c9177f70..9d5947c67 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/NativeAdUnit.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/NativeAdUnit.java @@ -18,9 +18,6 @@ import android.content.Context; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import org.prebid.mobile.rendering.bidding.data.AdSize; import org.prebid.mobile.rendering.bidding.data.FetchDemandResult; import org.prebid.mobile.rendering.bidding.data.NativeFetchDemandResult; @@ -30,7 +27,10 @@ import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.models.AdConfiguration; import org.prebid.mobile.rendering.models.ntv.NativeAdConfiguration; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class NativeAdUnit extends BaseAdUnit { private static final String TAG = NativeAdUnit.class.getSimpleName(); @@ -65,7 +65,7 @@ protected boolean isAdObjectSupported( @Override protected void onResponseReceived(BidResponse response) { if (mNativeFetchCompleteListener == null) { - OXLog.error(TAG, "Failed to pass callback. Ad object or OnFetchCompleteListener is null"); + LogUtil.error(TAG, "Failed to pass callback. Ad object or OnFetchCompleteListener is null"); return; } @@ -79,7 +79,7 @@ protected void onResponseReceived(BidResponse response) { @Override protected void onErrorReceived(AdException exception) { if (mNativeFetchCompleteListener == null) { - OXLog.error(TAG, "Failed to pass callback. Ad object or OnFetchCompleteListener is null"); + LogUtil.error(TAG, "Failed to pass callback. Ad object or OnFetchCompleteListener is null"); return; } final FetchDemandResult fetchDemandResult = FetchDemandResult.parseErrorMessage(exception.getMessage()); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/ReflectionUtils.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/ReflectionUtils.java index ef75b22f9..544a9c377 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/ReflectionUtils.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/ReflectionUtils.java @@ -19,7 +19,7 @@ import android.text.TextUtils; import org.prebid.mobile.rendering.bidding.data.bid.BidResponse; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -53,7 +53,7 @@ static Class getClassForString(String className) { return Class.forName(className); } catch (ClassNotFoundException e) { - OXLog.debug(TAG, e.getMessage()); + LogUtil.debug(TAG, e.getMessage()); } return null; } @@ -158,16 +158,16 @@ public static Object callMethodOnObject(Object object, String methodName, Object return method.invoke(object, params); } catch (NullPointerException e) { - OXLog.debug(TAG, e.getMessage()); + LogUtil.debug(TAG, e.getMessage()); } catch (NoSuchMethodException e) { - OXLog.debug(TAG, e.getMessage()); + LogUtil.debug(TAG, e.getMessage()); } catch (InvocationTargetException e) { - OXLog.debug(TAG, e.getMessage()); + LogUtil.debug(TAG, e.getMessage()); } catch (IllegalAccessException e) { - OXLog.debug(TAG, e.getMessage()); + LogUtil.debug(TAG, e.getMessage()); } return null; } @@ -178,16 +178,16 @@ private static Object callMethodOnObjectWithParameter(Object object, String meth return method.invoke(object, param); } catch (NullPointerException e) { - OXLog.debug(TAG, e.getMessage()); + LogUtil.debug(TAG, e.getMessage()); } catch (NoSuchMethodException e) { - OXLog.debug(TAG, e.getMessage()); + LogUtil.debug(TAG, e.getMessage()); } catch (InvocationTargetException e) { - OXLog.debug(TAG, e.getMessage()); + LogUtil.debug(TAG, e.getMessage()); } catch (IllegalAccessException e) { - OXLog.debug(TAG, e.getMessage()); + LogUtil.debug(TAG, e.getMessage()); } return null; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/VideoView.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/VideoView.java index 8fb45cc0d..f6129c996 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/VideoView.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/display/VideoView.java @@ -32,7 +32,7 @@ import org.prebid.mobile.rendering.models.ntv.NativeEventTracker; import org.prebid.mobile.rendering.utils.constants.IntentActions; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.VideoCreativeView; import org.prebid.mobile.rendering.views.AdViewManager; import org.prebid.mobile.rendering.views.AdViewManagerListener; @@ -185,7 +185,7 @@ public void setAutoPlay(boolean enable) { public void pause() { if (!canPause()) { - OXLog.debug(TAG, "pause() can't pause " + mVideoViewState); + LogUtil.debug(TAG, "pause() can't pause " + mVideoViewState); return; } @@ -195,7 +195,7 @@ public void pause() { public void resume() { if (!canResume()) { - OXLog.debug(TAG, "resume() can't resume " + mVideoViewState); + LogUtil.debug(TAG, "resume() can't resume " + mVideoViewState); return; } @@ -205,7 +205,7 @@ public void resume() { public void play() { if (!canPlay()) { - OXLog.debug(TAG, "play() can't play " + mVideoViewState); + LogUtil.debug(TAG, "play() can't play " + mVideoViewState); return; } @@ -288,7 +288,7 @@ private void showEndCardCreative(View creativeView) { private void showWatchAgain() { View watchAgainButton = Utils.createWatchAgainView(getContext()); if (watchAgainButton == null) { - OXLog.debug(TAG, "showWatchAgain: Failed. WatchAgainView is null"); + LogUtil.debug(TAG, "showWatchAgain: Failed. WatchAgainView is null"); return; } @@ -330,7 +330,7 @@ private void handleVisibilityChange(VisibilityTrackerResult result) { if (isVisible && canPlay()) { play(); - OXLog.debug(TAG, "handleVisibilityChange: auto show " + mVideoViewState); + LogUtil.debug(TAG, "handleVisibilityChange: auto show " + mVideoViewState); return; } @@ -341,12 +341,12 @@ private void handlePlaybackBasedOnVisibility(boolean isVisible) { if (!isVisible && canPause()) { mAdViewManager.pause(); changeState(State.PAUSED_AUTO); - OXLog.debug(TAG, "handleVisibilityChange: auto pause " + mVideoViewState); + LogUtil.debug(TAG, "handleVisibilityChange: auto pause " + mVideoViewState); } else if (isVisible && isInState(State.PAUSED_AUTO)) { mAdViewManager.resume(); changeState(State.PLAYING); - OXLog.debug(TAG, "handleVisibilityChange: auto resume " + mVideoViewState); + LogUtil.debug(TAG, "handleVisibilityChange: auto resume " + mVideoViewState); } } @@ -455,7 +455,7 @@ enum State { // public void onDismiss(DialogInterface dialog) { // VideoView videoAdView = mWeakVideoAdView.get(); // if (videoAdView == null) { - // OXLog.debug(TAG, "VideoDialog.onDismiss(): Unable to perform dismiss action. VideoAdView is null"); + // Log.debug(TAG, "VideoDialog.onDismiss(): Unable to perform dismiss action. VideoAdView is null"); // return; // } // videoAdView.resetViewToInitialState(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneBannerEventHandler.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneBannerEventHandler.java index 9790f39cb..f992175cf 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneBannerEventHandler.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneBannerEventHandler.java @@ -35,7 +35,7 @@ public void setBannerEventListener(BannerEventListener bannerViewListener) { @Override public void requestAdWithBid(Bid bid) { - mBannerViewListener.onOXBSdkWin(); + mBannerViewListener.onPrebidSdkWin(); } @Override diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneInterstitialEventHandler.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneInterstitialEventHandler.java index 6c9f033b5..f57bed8eb 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneInterstitialEventHandler.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneInterstitialEventHandler.java @@ -16,11 +16,11 @@ package org.prebid.mobile.rendering.bidding.interfaces; -import androidx.annotation.Nullable; - import org.prebid.mobile.rendering.bidding.data.bid.Bid; import org.prebid.mobile.rendering.bidding.listeners.InterstitialEventListener; +import androidx.annotation.Nullable; + public class StandaloneInterstitialEventHandler implements InterstitialEventHandler { private InterstitialEventListener mInterstitialEventListener; @@ -33,7 +33,7 @@ public void setInterstitialEventListener(InterstitialEventListener interstitialE public void requestAdWithBid( @Nullable Bid bid) { - mInterstitialEventListener.onOXBSdkWin(); + mInterstitialEventListener.onPrebidSdkWin(); } @Override diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneRewardedVideoEventHandler.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneRewardedVideoEventHandler.java index 98f89c9a2..28149daeb 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneRewardedVideoEventHandler.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/interfaces/StandaloneRewardedVideoEventHandler.java @@ -16,12 +16,12 @@ package org.prebid.mobile.rendering.bidding.interfaces; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import org.prebid.mobile.rendering.bidding.data.bid.Bid; import org.prebid.mobile.rendering.bidding.listeners.RewardedVideoEventListener; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public class StandaloneRewardedVideoEventHandler implements RewardedEventHandler { private RewardedVideoEventListener mListener; @@ -36,7 +36,7 @@ public void setRewardedEventListener( public void requestAdWithBid( @Nullable Bid bid) { - mListener.onOXBSdkWin(); + mListener.onPrebidSdkWin(); } @Override diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/BannerEventListener.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/BannerEventListener.java index 08fea26f0..a7454f687 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/BannerEventListener.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/BannerEventListener.java @@ -21,7 +21,7 @@ import org.prebid.mobile.rendering.errors.AdException; public interface BannerEventListener { - void onOXBSdkWin(); + void onPrebidSdkWin(); void onAdServerWin(View view); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/BannerViewListener.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/BannerViewListener.java index 1eca405d5..7c395aed8 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/BannerViewListener.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/BannerViewListener.java @@ -20,7 +20,7 @@ import org.prebid.mobile.rendering.errors.AdException; /** - * Listener interface representing OXBBannerView events. + * Listener interface representing BannerView events. * All methods will be invoked on the main thread. */ public interface BannerViewListener { diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/InterstitialAdUnitListener.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/InterstitialAdUnitListener.java index 13a95b9da..25ebd4d2f 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/InterstitialAdUnitListener.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/InterstitialAdUnitListener.java @@ -20,7 +20,7 @@ import org.prebid.mobile.rendering.errors.AdException; /** - * Listener interface representing OXBInterstitialAdUnit events. + * Listener interface representing InterstitialAdUnit events. * All methods will be invoked on the main thread. */ public interface InterstitialAdUnitListener { diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/InterstitialEventListener.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/InterstitialEventListener.java index 348a6bb49..426bb6b62 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/InterstitialEventListener.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/InterstitialEventListener.java @@ -19,7 +19,7 @@ import org.prebid.mobile.rendering.errors.AdException; public interface InterstitialEventListener { - void onOXBSdkWin(); + void onPrebidSdkWin(); void onAdServerWin(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/RewardedAdUnitListener.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/RewardedAdUnitListener.java index 6584b9299..3c5516c52 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/RewardedAdUnitListener.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/RewardedAdUnitListener.java @@ -20,7 +20,7 @@ import org.prebid.mobile.rendering.errors.AdException; /** - * Listener interface representing OXBRewardedAdUnit events. + * Listener interface representing RewardedAdUnit events. * All methods will be invoked on the main thread. */ public interface RewardedAdUnitListener { diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/RewardedVideoEventListener.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/RewardedVideoEventListener.java index 10296c9a6..82c6cafd1 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/RewardedVideoEventListener.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/listeners/RewardedVideoEventListener.java @@ -19,7 +19,7 @@ import org.prebid.mobile.rendering.errors.AdException; public interface RewardedVideoEventListener { - void onOXBSdkWin(); + void onPrebidSdkWin(); void onAdServerWin(Object userReward); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/loader/BidLoader.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/loader/BidLoader.java index 82fbdd752..0f5c23846 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/loader/BidLoader.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/loader/BidLoader.java @@ -28,7 +28,7 @@ import org.prebid.mobile.rendering.networking.parameters.AdRequestInput; import org.prebid.mobile.rendering.sdk.PrebidRenderingSettings; import org.prebid.mobile.rendering.utils.helpers.RefreshTimerTask; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.lang.ref.WeakReference; import java.util.Map; @@ -82,22 +82,22 @@ public void onErrorWithException(Exception e, long responseTime) { private final RefreshTimerTask mRefreshTimerTask = new RefreshTimerTask(() -> { if (mAdConfiguration == null) { - OXLog.error(TAG, "handleRefresh(): Failure. AdConfiguration is null"); + LogUtil.error(TAG, "handleRefresh(): Failure. AdConfiguration is null"); return; } if (mBidRefreshListener == null) { - OXLog.error(TAG, "RefreshListener is null. No refresh or load will be performed."); + LogUtil.error(TAG, "RefreshListener is null. No refresh or load will be performed."); return; } if (!mBidRefreshListener.canPerformRefresh()) { - OXLog.debug(TAG, "handleRefresh(): Loading skipped, rescheduling timer. View is not visible."); + LogUtil.debug(TAG, "handleRefresh(): Loading skipped, rescheduling timer. View is not visible."); setupRefreshTimer(); return; } - OXLog.debug(TAG, "refresh triggered: load() being called "); + LogUtil.debug(TAG, "refresh triggered: load() being called "); load(); }); @@ -114,22 +114,22 @@ public void setBidRefreshListener(BidRefreshListener bidRefreshListener) { public void load() { if (mRequestListener == null) { - OXLog.warn(TAG, "Listener is null"); + LogUtil.warn(TAG, "Listener is null"); return; } if (mAdConfiguration == null) { - OXLog.warn(TAG, "No ad request configuration to load"); + LogUtil.warn(TAG, "No ad request configuration to load"); return; } if (mContextReference.get() == null) { - OXLog.warn(TAG, "Context is null"); + LogUtil.warn(TAG, "Context is null"); return; } // If mCurrentlyLoading == false, set it to true and return true; else return false // If compareAndSet returns false, it means mCurrentlyLoading was already true and therefore we should skip loading if (!mCurrentlyLoading.compareAndSet(false, true)) { - OXLog.warn(TAG, "Previous load is in progress. Load() ignored."); + LogUtil.warn(TAG, "Previous load is in progress. Load() ignored."); return; } @@ -137,12 +137,12 @@ public void load() { } public void setupRefreshTimer() { - OXLog.debug(TAG, "Schedule refresh timer"); + LogUtil.debug(TAG, "Schedule refresh timer"); boolean isRefreshAvailable = mAdConfiguration != null && mAdConfiguration.isAdType(AdConfiguration.AdUnitIdentifierType.BANNER); if (!isRefreshAvailable) { - OXLog.debug(TAG, "setupRefreshTimer: Failed. AdConfiguration is null or AdType is not Banner"); + LogUtil.debug(TAG, "setupRefreshTimer: Failed. AdConfiguration is null or AdType is not Banner"); return; } @@ -152,8 +152,8 @@ public void setupRefreshTimer() { //So, check it against it to stop it from creating a refreshtask if (refreshTimeMillis == Integer.MAX_VALUE || refreshTimeMillis <= 0) { - OXLog.debug(TAG, "setupRefreshTimer(): refreshTimeMillis is: " - + refreshTimeMillis + ". Skipping refresh timer initialization"); + LogUtil.debug(TAG, "setupRefreshTimer(): refreshTimeMillis is: " + + refreshTimeMillis + ". Skipping refresh timer initialization"); return; } @@ -163,7 +163,7 @@ public void setupRefreshTimer() { } public void cancelRefresh() { - OXLog.debug(TAG, "Cancel refresh timer"); + LogUtil.debug(TAG, "Cancel refresh timer"); mRefreshTimerTask.cancelRefreshTimer(); } @@ -187,11 +187,11 @@ private void sendBidRequest(Context context, AdConfiguration config) { } private void failedToLoadBid(String msg) { - OXLog.error(TAG, "Invalid bid response: " + msg); + LogUtil.error(TAG, "Invalid bid response: " + msg); mCurrentlyLoading.set(false); if (mRequestListener == null) { - OXLog.warn(TAG, "onFailedToLoad: Listener is null."); + LogUtil.warn(TAG, "onFailedToLoad: Listener is null."); cancelRefresh(); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BannerView.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BannerView.java index eb65b7c97..088489a16 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BannerView.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BannerView.java @@ -24,10 +24,6 @@ import android.view.View; import android.widget.FrameLayout; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.R; import org.prebid.mobile.rendering.bidding.data.AdSize; import org.prebid.mobile.rendering.bidding.data.bid.Bid; @@ -52,12 +48,16 @@ import org.prebid.mobile.rendering.sdk.PrebidRenderingSettings; import org.prebid.mobile.rendering.utils.broadcast.ScreenStateReceiver; import org.prebid.mobile.rendering.utils.helpers.VisibilityChecker; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.mraid.Views; import java.util.Map; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + public class BannerView extends FrameLayout { private final static String TAG = BannerView.class.getSimpleName(); @@ -137,15 +137,15 @@ public void onError(AdException exception) { private final BannerEventListener mBannerEventListener = new BannerEventListener() { @Override - public void onOXBSdkWin() { + public void onPrebidSdkWin() { markPrimaryAdRequestFinished(); if (isBidInvalid()) { - notifyErrorListener(new AdException(AdException.INTERNAL_ERROR, "WinnerBid is null when executing onOXBSdkWin.")); + notifyErrorListener(new AdException(AdException.INTERNAL_ERROR, "WinnerBid is null when executing onPrebidSdkWin.")); return; } - displayOxbView(); + displayPrebidView(); } @Override @@ -165,7 +165,7 @@ public void onAdFailed(AdException exception) { return; } - onOXBSdkWin(); + onPrebidSdkWin(); } @Override @@ -234,12 +234,12 @@ public BannerView(Context context, String configId, */ public void loadAd() { if (mBidLoader == null) { - OXLog.error(TAG, "loadAd: Failed. BidLoader is not initialized."); + LogUtil.error(TAG, "loadAd: Failed. BidLoader is not initialized."); return; } if (mIsPrimaryAdServerRequestInProgress) { - OXLog.debug(TAG, "loadAd: Skipped. Loading is in progress."); + LogUtil.debug(TAG, "loadAd: Skipped. Loading is in progress."); return; } @@ -283,11 +283,11 @@ public void destroy() { //region ==================== getters and setters public void setAutoRefreshDelay(int seconds) { if (!mAdUnitConfig.isAdType(AdConfiguration.AdUnitIdentifierType.BANNER)) { - OXLog.info(TAG, "Autorefresh is available only for Banner ad type"); + LogUtil.info(TAG, "Autorefresh is available only for Banner ad type"); return; } if (seconds < 0) { - OXLog.error(TAG, "setRefreshIntervalInSec: Failed. Refresh interval must be >= 0"); + LogUtil.error(TAG, "setRefreshIntervalInSec: Failed. Refresh interval must be >= 0"); return; } mAdUnitConfig.setAutoRefreshDelay(seconds); @@ -391,7 +391,7 @@ public BannerAdPosition getAdPosition() { private void reflectAttrs(AttributeSet attrs) { if (attrs == null) { - OXLog.debug(TAG, "reflectAttrs. No attributes provided."); + LogUtil.debug(TAG, "reflectAttrs. No attributes provided."); return; } TypedArray typedArray = getContext() @@ -451,7 +451,7 @@ private void initAdConfiguration() { mAdUnitConfig.addSizes(mEventHandler.getAdSizeArray()); } - private void displayOxbView() { + private void displayPrebidView() { if (indexOfChild(mDisplayView) != -1) { mDisplayView.destroy(); mDisplayView = null; diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnit.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnit.java index 83629b944..ee2ee33f6 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnit.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnit.java @@ -18,9 +18,6 @@ import android.content.Context; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.bidding.data.bid.Bid; import org.prebid.mobile.rendering.bidding.data.bid.BidResponse; import org.prebid.mobile.rendering.bidding.display.InterstitialController; @@ -31,16 +28,19 @@ import org.prebid.mobile.rendering.models.AdConfiguration; import org.prebid.mobile.rendering.models.AdPosition; import org.prebid.mobile.rendering.sdk.PrebidRenderingSettings; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.lang.ref.WeakReference; import java.util.Map; import java.util.Set; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.LOADING; import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_FOR_LOAD; import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_GAM; -import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_OXB; +import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_PREBID; public abstract class BaseInterstitialAdUnit { private static final String TAG = BaseInterstitialAdUnit.class.getSimpleName(); @@ -60,7 +60,7 @@ public abstract class BaseInterstitialAdUnit { public void onFetchCompleted(BidResponse response) { mBidResponse = response; - changeOxbInterstitialAdUnitState(LOADING); + changeInterstitialAdUnitState(LOADING); requestAdWithBid(getWinnerBid()); } @@ -74,7 +74,7 @@ public void onError(AdException exception) { private final InterstitialControllerListener mControllerListener = new InterstitialControllerListener() { @Override public void onInterstitialReadyForDisplay() { - changeOxbInterstitialAdUnitState(READY_TO_DISPLAY_OXB); + changeInterstitialAdUnitState(READY_TO_DISPLAY_PREBID); notifyAdEventListener(AdListenerEvent.AD_LOADED); } @@ -85,13 +85,13 @@ public void onInterstitialClicked() { @Override public void onInterstitialFailedToLoad(AdException exception) { - changeOxbInterstitialAdUnitState(READY_FOR_LOAD); + changeInterstitialAdUnitState(READY_FOR_LOAD); notifyErrorListener(exception); } @Override public void onInterstitialDisplayed() { - changeOxbInterstitialAdUnitState(READY_FOR_LOAD); + changeInterstitialAdUnitState(READY_FOR_LOAD); notifyAdEventListener(AdListenerEvent.AD_DISPLAYED); } @@ -121,12 +121,12 @@ abstract void requestAdWithBid( */ public void loadAd() { if (mBidLoader == null) { - OXLog.error(TAG, "loadAd: Failed. BidLoader is not initialized."); + LogUtil.error(TAG, "loadAd: Failed. BidLoader is not initialized."); return; } if (!isAdLoadAllowed()) { - OXLog.debug(TAG, "loadAd: Skipped. OXBInterstitialAdUnitState is: " + mInterstitialAdUnitState); + LogUtil.debug(TAG, "loadAd: Skipped. InterstitialAdUnitState is: " + mInterstitialAdUnitState); return; } @@ -145,7 +145,7 @@ public boolean isLoaded() { */ public void show() { if (!isAuctionWinnerReadyToDisplay()) { - OXLog.debug(TAG, "show(): Ad is not yet ready for display!"); + LogUtil.debug(TAG, "show(): Ad is not yet ready for display!"); return; } @@ -153,7 +153,7 @@ public void show() { case READY_TO_DISPLAY_GAM: showGamAd(); break; - case READY_TO_DISPLAY_OXB: + case READY_TO_DISPLAY_PREBID: mInterstitialController.show(); break; default: @@ -225,7 +225,7 @@ protected void init(AdConfiguration adUnitConfiguration) { initInterstitialController(); } - protected void loadOxbAd() { + protected void loadPrebidAd() { if (mInterstitialController == null) { notifyErrorListener(new AdException(AdException.INTERNAL_ERROR, "InterstitialController is not defined. Unable to process bid.")); return; @@ -243,7 +243,7 @@ protected boolean isBidInvalid() { return mBidResponse == null || mBidResponse.getWinningBid() == null; } - protected void changeOxbInterstitialAdUnitState(InterstitialAdUnitState state) { + protected void changeInterstitialAdUnitState(InterstitialAdUnitState state) { mInterstitialAdUnitState = state; } @@ -274,7 +274,7 @@ private Bid getWinnerBid() { } private boolean isAuctionWinnerReadyToDisplay() { - return mInterstitialAdUnitState == READY_TO_DISPLAY_OXB + return mInterstitialAdUnitState == READY_TO_DISPLAY_PREBID || mInterstitialAdUnitState == READY_TO_DISPLAY_GAM; } @@ -298,8 +298,8 @@ enum AdListenerEvent { enum InterstitialAdUnitState { READY_FOR_LOAD, LOADING, - OXB_LOADING, + PREBID_LOADING, READY_TO_DISPLAY_GAM, - READY_TO_DISPLAY_OXB + READY_TO_DISPLAY_PREBID } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnit.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnit.java index 014ac323d..f952bf464 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnit.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnit.java @@ -27,7 +27,7 @@ import org.prebid.mobile.rendering.bidding.listeners.InterstitialEventListener; import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.models.AdConfiguration; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -46,31 +46,31 @@ public class InterstitialAdUnit extends BaseInterstitialAdUnit { //region ==================== Listener implementation private final InterstitialEventListener mInterstitialEventListener = new InterstitialEventListener() { @Override - public void onOXBSdkWin() { + public void onPrebidSdkWin() { if (isBidInvalid()) { - changeOxbInterstitialAdUnitState(READY_FOR_LOAD); - notifyErrorListener(new AdException(AdException.INTERNAL_ERROR, "WinnerBid is null when executing onOXBSdkWin.")); + changeInterstitialAdUnitState(READY_FOR_LOAD); + notifyErrorListener(new AdException(AdException.INTERNAL_ERROR, "WinnerBid is null when executing onPrebidSdkWin.")); return; } - loadOxbAd(); + loadPrebidAd(); } @Override public void onAdServerWin() { - changeOxbInterstitialAdUnitState(READY_TO_DISPLAY_GAM); + changeInterstitialAdUnitState(READY_TO_DISPLAY_GAM); notifyAdEventListener(AdListenerEvent.AD_LOADED); } @Override public void onAdFailed(AdException exception) { if (isBidInvalid()) { - changeOxbInterstitialAdUnitState(READY_FOR_LOAD); + changeInterstitialAdUnitState(READY_FOR_LOAD); notifyErrorListener(exception); return; } - onOXBSdkWin(); + onPrebidSdkWin(); } @Override @@ -80,7 +80,7 @@ public void onAdClosed() { @Override public void onAdDisplayed() { - changeOxbInterstitialAdUnitState(READY_FOR_LOAD); + changeInterstitialAdUnitState(READY_FOR_LOAD); notifyAdEventListener(AdListenerEvent.AD_DISPLAYED); } }; @@ -113,7 +113,7 @@ public InterstitialAdUnit(Context context, String configId, } /** - * Instantiates an OXBInterstitialAdUnit for GAM prebid integration with given adUnitType. + * Instantiates an InterstitialAdUnit for GAM prebid integration with given adUnitType. */ public InterstitialAdUnit(Context context, String configId, @NonNull @@ -135,7 +135,7 @@ private InterstitialAdUnit(Context context, String configId, AdConfiguration adUnitConfiguration = new AdConfiguration(); adUnitConfiguration.setConfigId(configId); adUnitConfiguration.setMinSizePercentage(minSizePercentage); - adUnitConfiguration.setAdUnitIdentifierType(mapOxbAdUnitTypeToAdConfigAdUnitType(adUnitFormat)); + adUnitConfiguration.setAdUnitIdentifierType(mapPrebidAdUnitTypeToAdConfigAdUnitType(adUnitFormat)); init(adUnitConfiguration); } @@ -170,7 +170,7 @@ void showGamAd() { @Override void notifyAdEventListener(AdListenerEvent adListenerEvent) { if (mInterstitialAdUnitListener == null) { - OXLog.debug(TAG, "notifyAdEventListener: Failed. AdUnitListener is null. Passed listener event: " + adListenerEvent); + LogUtil.debug(TAG, "notifyAdEventListener: Failed. AdUnitListener is null. Passed listener event: " + adListenerEvent); return; } @@ -197,14 +197,14 @@ void notifyErrorListener(AdException exception) { } } - private AdConfiguration.AdUnitIdentifierType mapOxbAdUnitTypeToAdConfigAdUnitType(AdUnitFormat adUnitFormat) { + private AdConfiguration.AdUnitIdentifierType mapPrebidAdUnitTypeToAdConfigAdUnitType(AdUnitFormat adUnitFormat) { switch (adUnitFormat) { case DISPLAY: return AdConfiguration.AdUnitIdentifierType.INTERSTITIAL; case VIDEO: return AdConfiguration.AdUnitIdentifierType.VAST; default: - OXLog.debug(TAG, "setAdUnitIdentifierType: Provided AdUnitType [" + adUnitFormat + "] doesn't match any expected adUnitType."); + LogUtil.debug(TAG, "setAdUnitIdentifierType: Provided AdUnitType [" + adUnitFormat + "] doesn't match any expected adUnitType."); return null; } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnit.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnit.java index 18cc4cc23..47fe8f485 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnit.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnit.java @@ -18,8 +18,6 @@ import android.content.Context; -import androidx.annotation.Nullable; - import org.prebid.mobile.rendering.bidding.data.bid.Bid; import org.prebid.mobile.rendering.bidding.interfaces.RewardedEventHandler; import org.prebid.mobile.rendering.bidding.interfaces.StandaloneRewardedVideoEventHandler; @@ -27,7 +25,9 @@ import org.prebid.mobile.rendering.bidding.listeners.RewardedVideoEventListener; import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.models.AdConfiguration; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; + +import androidx.annotation.Nullable; import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_FOR_LOAD; import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_GAM; @@ -47,32 +47,32 @@ public class RewardedAdUnit extends BaseInterstitialAdUnit { private final RewardedVideoEventListener mEventListener = new RewardedVideoEventListener() { @Override - public void onOXBSdkWin() { + public void onPrebidSdkWin() { if (isBidInvalid()) { - changeOxbInterstitialAdUnitState(READY_FOR_LOAD); - notifyErrorListener(new AdException(AdException.INTERNAL_ERROR, "WinnerBid is null when executing onOXBSdkWin.")); + changeInterstitialAdUnitState(READY_FOR_LOAD); + notifyErrorListener(new AdException(AdException.INTERNAL_ERROR, "WinnerBid is null when executing onPrebidSdkWin.")); return; } - loadOxbAd(); + loadPrebidAd(); } @Override public void onAdServerWin(Object userReward) { mUserReward = userReward; - changeOxbInterstitialAdUnitState(READY_TO_DISPLAY_GAM); + changeInterstitialAdUnitState(READY_TO_DISPLAY_GAM); notifyAdEventListener(AdListenerEvent.AD_LOADED); } @Override public void onAdFailed(AdException exception) { if (isBidInvalid()) { - changeOxbInterstitialAdUnitState(READY_FOR_LOAD); + changeInterstitialAdUnitState(READY_FOR_LOAD); notifyErrorListener(exception); return; } - onOXBSdkWin(); + onPrebidSdkWin(); } @Override @@ -87,7 +87,7 @@ public void onAdClosed() { @Override public void onAdDisplayed() { - changeOxbInterstitialAdUnitState(READY_FOR_LOAD); + changeInterstitialAdUnitState(READY_FOR_LOAD); notifyAdEventListener(AdListenerEvent.AD_DISPLAYED); } @@ -159,7 +159,7 @@ void showGamAd() { @Override void notifyAdEventListener(AdListenerEvent adListenerEvent) { if (mRewardedAdUnitListener == null) { - OXLog.debug(TAG, "notifyAdEventListener: Failed. AdUnitListener is null. Passed listener event: " + adListenerEvent); + LogUtil.debug(TAG, "notifyAdEventListener: Failed. AdUnitListener is null. Passed listener event: " + adListenerEvent); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdBaseDialog.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdBaseDialog.java index 9e0be66fa..c2010b39d 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdBaseDialog.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdBaseDialog.java @@ -38,7 +38,7 @@ import org.prebid.mobile.rendering.sdk.deviceData.managers.DeviceInfoManager; import org.prebid.mobile.rendering.utils.broadcast.OrientationBroadcastReceiver; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import org.prebid.mobile.rendering.views.webview.WebViewBase; import org.prebid.mobile.rendering.views.webview.mraid.JsExecutor; @@ -86,7 +86,7 @@ public void onResult(String propertyJson) { @Override public void onError(Throwable throwable) { - OXLog.error(TAG, "ExpandProperties failed: " + Log.getStackTraceString(throwable)); + LogUtil.error(TAG, "ExpandProperties failed: " + Log.getStackTraceString(throwable)); } }; private DialogEventListener mListener; @@ -186,7 +186,7 @@ public void cleanup() { } catch (IllegalArgumentException e) { - OXLog.error(TAG, Log.getStackTraceString(e)); + LogUtil.error(TAG, Log.getStackTraceString(e)); } cancel(); } @@ -238,7 +238,7 @@ protected void init() { applyOrientation(); } catch (AdException e) { - OXLog.error(TAG, Log.getStackTraceString(e)); + LogUtil.error(TAG, Log.getStackTraceString(e)); } //Register orientation change listener for MRAID ads only if (mContextReference.get() != null) { @@ -284,7 +284,7 @@ void loadExpandProperties() { protected void lockOrientation() { Activity activity = getActivity(); if (activity == null) { - OXLog.error(TAG, "lockOrientation failure. Activity is null"); + LogUtil.error(TAG, "lockOrientation failure. Activity is null"); return; } Display getOrient = activity.getWindowManager().getDefaultDisplay(); @@ -299,7 +299,7 @@ protected void lockOrientation() { protected void lockOrientation(final int screenOrientation) { Activity activity = getActivity(); if (activity == null) { - OXLog.error(TAG, "lockOrientation failure. Activity is null"); + LogUtil.error(TAG, "lockOrientation failure. Activity is null"); return; } @@ -323,21 +323,21 @@ protected Activity getActivity() { return (Activity) mContextReference.get(); } catch (Exception e) { - OXLog.error(TAG, "Context is not an activity"); + LogUtil.error(TAG, "Context is not an activity"); return null; } } protected void addCloseView() { if (mAdViewContainer == null) { - OXLog.error(TAG, "Unable to add close button. Container is null"); + LogUtil.error(TAG, "Unable to add close button. Container is null"); return; } mCloseView = Utils.createCloseView(mContextReference.get()); if (mCloseView == null) { - OXLog.error(TAG, "Unable to add close button. Close view is null"); + LogUtil.error(TAG, "Unable to add close button. Close view is null"); return; } @@ -376,7 +376,7 @@ private void applyOrientation() throws AdException { private void handleExpandPropertiesResult(String expandProperties) { if (mWebViewBase == null || mWebViewBase.getMRAIDInterface() == null) { - OXLog.debug(TAG, "handleExpandPropertiesResult: WebViewBase or MraidInterface is null. Skipping."); + LogUtil.debug(TAG, "handleExpandPropertiesResult: WebViewBase or MraidInterface is null. Skipping."); return; } @@ -405,7 +405,7 @@ private void initOrientationProperties() { forceOrientation = orientationProperties.optString("forceOrientation", "none"); } catch (Exception e) { - OXLog.error(TAG, "Failed to get the orientation details from JSON for MRAID: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to get the orientation details from JSON for MRAID: " + Log.getStackTraceString(e)); } if (!mraidVariableContainer.isLaunchedWithUrl()) { @@ -425,7 +425,7 @@ private static class OnDialogShowListener implements OnShowListener { public void onShow(DialogInterface dialog) { AdBaseDialog adBaseDialog = mWeakAdBaseDialog.get(); if (adBaseDialog == null) { - OXLog.debug(TAG, "onShown(): Error notifying show listeners. AdBaseDialog is null."); + LogUtil.debug(TAG, "onShown(): Error notifying show listeners. AdBaseDialog is null."); return; } adBaseDialog.handleDialogShow(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdExpandedDialog.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdExpandedDialog.java index 59d3f6583..52bcc2063 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdExpandedDialog.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdExpandedDialog.java @@ -22,7 +22,7 @@ import android.view.View; import android.widget.RelativeLayout; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import org.prebid.mobile.rendering.views.webview.PrebidWebViewBase; import org.prebid.mobile.rendering.views.webview.WebViewBase; @@ -49,7 +49,7 @@ public AdExpandedDialog(final Context context, final WebViewBase webViewBaseLoca if (mWebViewBase != null) { //detach from closecontainer mWebViewBase.detachFromParent(); - //add it back to OXWebView. + //add it back to WebView. PrebidWebViewBase defaultContainer = (PrebidWebViewBase) mWebViewBase.getPreloadedListener(); //use getPreloadedListener() to get defaultContainer, as mDefaultContainer is not initiated for non-mraid cases(such as interstitials) @@ -61,14 +61,14 @@ public AdExpandedDialog(final Context context, final WebViewBase webViewBaseLoca ((Activity) context).setRequestedOrientation(mInitialOrientation); } else { - OXLog.error(TAG, "Context is not Activity, can not set orientation"); + LogUtil.error(TAG, "Context is not Activity, can not set orientation"); } mWebViewBase.getMRAIDInterface().onStateChange(JSInterface.STATE_DEFAULT); } } catch (Exception e) { - OXLog.error(TAG, "Expanded ad closed but post-close events failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Expanded ad closed but post-close events failed: " + Log.getStackTraceString(e)); } }); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdInterstitialDialog.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdInterstitialDialog.java index ca7d41a31..b55effe80 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdInterstitialDialog.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/interstitial/AdInterstitialDialog.java @@ -22,7 +22,7 @@ import android.widget.FrameLayout; import android.widget.RelativeLayout; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import org.prebid.mobile.rendering.views.webview.WebViewBase; import org.prebid.mobile.rendering.views.webview.mraid.JSInterface; @@ -62,7 +62,7 @@ private void setListeners() { } } catch (Exception e) { - OXLog.error(TAG, "Interstitial ad closed but post-close events failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Interstitial ad closed but post-close events failed: " + Log.getStackTraceString(e)); } }); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/CreativeFactory.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/CreativeFactory.java index 585acce8c..bd8f15d4b 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/CreativeFactory.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/CreativeFactory.java @@ -31,7 +31,7 @@ import org.prebid.mobile.rendering.models.TrackingEvent; import org.prebid.mobile.rendering.session.manager.OmAdSessionManager; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.RewardedVideoCreative; import org.prebid.mobile.rendering.video.VideoAdEvent; import org.prebid.mobile.rendering.video.VideoCreative; @@ -98,7 +98,7 @@ public void start() { default: String msg = "Unable to start creativeFactory. adConfig.adUnitIdentifierType doesn't match supported types" + "adConfig.adUnitIdentifierType: " + adUnitIdentifierType; - OXLog.error(TAG, msg); + LogUtil.error(TAG, msg); AdException adException = new AdException(AdException.INTERNAL_ERROR, msg); mListener.onFailure(adException); break; @@ -106,7 +106,7 @@ public void start() { } catch (Exception exception) { String message = "Creative Factory failed: " + exception.getMessage(); - OXLog.error(TAG, message + Log.getStackTraceString(exception)); + LogUtil.error(TAG, message + Log.getStackTraceString(exception)); AdException adException = new AdException(AdException.INTERNAL_ERROR, message); mListener.onFailure(adException); } @@ -179,7 +179,7 @@ private void attemptVastCreative() { newCreative.load(); } catch (Exception exception) { - OXLog.error(TAG, "VideoCreative creation failed: " + Log.getStackTraceString(exception)); + LogUtil.error(TAG, "VideoCreative creation failed: " + Log.getStackTraceString(exception)); mListener.onFailure(new AdException(AdException.INTERNAL_ERROR, "VideoCreative creation failed: " + exception.getMessage())); } } @@ -224,12 +224,12 @@ static class CreativeFactoryCreativeResolutionListener implements CreativeResolu public void creativeReady(AbstractCreative creative) { CreativeFactory creativeFactory = mWeakCreativeFactory.get(); if (creativeFactory == null) { - OXLog.warn(TAG, "CreativeFactory is null"); + LogUtil.warn(TAG, "CreativeFactory is null"); return; } if (creativeFactory.mTimeoutState == TimeoutState.EXPIRED) { creativeFactory.mListener.onFailure(new AdException(AdException.INTERNAL_ERROR, "Creative Timeout")); - OXLog.warn(TAG, "Creative timed out, backing out"); + LogUtil.warn(TAG, "Creative timed out, backing out"); return; } creativeFactory.mTimeoutState = TimeoutState.FINISHED; @@ -241,7 +241,7 @@ public void creativeReady(AbstractCreative creative) { public void creativeFailed(AdException error) { CreativeFactory creativeFactory = mWeakCreativeFactory.get(); if (creativeFactory == null) { - OXLog.warn(TAG, "CreativeFactory is null"); + LogUtil.warn(TAG, "CreativeFactory is null"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/FileDownloadTask.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/FileDownloadTask.java index bdde7aad2..be24d1144 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/FileDownloadTask.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/FileDownloadTask.java @@ -20,7 +20,7 @@ import org.prebid.mobile.rendering.errors.ServerWrongStatusCode; import org.prebid.mobile.rendering.networking.BaseNetworkTask; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.io.File; import java.io.FileOutputStream; @@ -90,7 +90,7 @@ public GetUrlResult customParser(int code, URLConnection urlConnection) { processData(urlConnection, result); } catch (IOException e) { - OXLog.error(TAG, "download of media failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "download of media failed: " + Log.getStackTraceString(e)); result.setException(new Exception("download of media failed " + e.getMessage())); } finally { @@ -129,7 +129,7 @@ protected void processData(URLConnection connection, GetUrlResult result) throws @Override protected void onPostExecute(GetUrlResult urlResult) { if (urlResult.getException() != null) { - OXLog.debug(TAG, "download of media failed" + urlResult.getException()); + LogUtil.debug(TAG, "download of media failed" + urlResult.getException()); if (mListener != null) { mListener.onFileDownloadError((urlResult.getException().getMessage())); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/Transaction.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/Transaction.java index 0d9293250..9c32f2a6c 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/Transaction.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/Transaction.java @@ -23,7 +23,7 @@ import org.prebid.mobile.rendering.models.CreativeModelsMaker; import org.prebid.mobile.rendering.sdk.JSLibraryManager; import org.prebid.mobile.rendering.session.manager.OmAdSessionManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import java.lang.ref.WeakReference; @@ -113,7 +113,7 @@ private void checkForBuiltInVideo() { } } catch (Exception e) { - OXLog.error(TAG, "Failed to check for built in video override"); + LogUtil.error(TAG, "Failed to check for built in video override"); } } @@ -164,7 +164,7 @@ private boolean startNextCreativeFactory() { private void stopOmAdSession() { if (mOmAdSessionManager == null) { - OXLog.error(TAG, "Failed to stopOmAdSession. OmAdSessionManager is null"); + LogUtil.error(TAG, "Failed to stopOmAdSession. OmAdSessionManager is null"); return; } @@ -208,7 +208,7 @@ public static class CreativeFactoryListener implements CreativeFactory.Listener public void onSuccess() { Transaction transaction = mWeakTransaction.get(); if (transaction == null) { - OXLog.warn(TAG, "CreativeMaker is null"); + LogUtil.warn(TAG, "CreativeMaker is null"); return; } @@ -225,7 +225,7 @@ public void onSuccess() { public void onFailure(AdException e) { Transaction transaction = mWeakTransaction.get(); if (transaction == null) { - OXLog.warn(TAG, "CreativeMaker is null"); + LogUtil.warn(TAG, "CreativeMaker is null"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/TransactionManager.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/TransactionManager.java index 3e4a8b178..fcb4e6dea 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/TransactionManager.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/TransactionManager.java @@ -24,7 +24,7 @@ import org.prebid.mobile.rendering.models.AdConfiguration; import org.prebid.mobile.rendering.models.CreativeModelMakerBids; import org.prebid.mobile.rendering.models.CreativeModelsMaker; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import java.lang.ref.WeakReference; @@ -75,7 +75,7 @@ public void onFailedToLoadAd(AdException e, String vastLoaderIdentifier) { public void onTransactionSuccess(Transaction transaction) { mLatestTransaction = null; if (mListener == null) { - OXLog.warn(TAG, "Unable to notify listener. Listener is null"); + LogUtil.warn(TAG, "Unable to notify listener. Listener is null"); return; } mTransactions.add(transaction); @@ -90,7 +90,7 @@ public void onTransactionFailure(AdException e, String identifier) { /** * Initiates the process of creating creative model and transaction from parsed bid response * - * @param adConfiguration - OXBAdConfiguration + * @param adConfiguration - AdConfiguration * @param bidResponse - parsed bid response */ public void fetchBidTransaction(AdConfiguration adConfiguration, BidResponse bidResponse) { @@ -128,7 +128,7 @@ public Transaction dismissCurrentTransaction() { public AbstractCreative getCurrentCreative() { Transaction transaction = getCurrentTransaction(); if (transaction == null) { - OXLog.error(TAG, "Get Current creative called with no ad"); + LogUtil.error(TAG, "Get Current creative called with no ad"); return null; } return transaction.getCreativeFactories().get(mCurrentTransactionCreativeIndex).getCreative(); @@ -182,7 +182,7 @@ private void cancelBidModelMaker() { private void notifyListenerError(AdException e) { if (mListener == null) { - OXLog.warn(TAG, "Unable to notify listener. Listener is null"); + LogUtil.warn(TAG, "Unable to notify listener. Listener is null"); return; } mListener.onFetchingFailed(e); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/VastParserExtractor.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/VastParserExtractor.java index ca745aeb9..a43173d0a 100755 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/VastParserExtractor.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/loading/VastParserExtractor.java @@ -19,9 +19,6 @@ import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.errors.VastParseError; import org.prebid.mobile.rendering.models.internal.VastExtractorResult; @@ -30,9 +27,12 @@ import org.prebid.mobile.rendering.networking.modelcontrollers.AsyncVastLoader; import org.prebid.mobile.rendering.parser.AdResponseParserBase; import org.prebid.mobile.rendering.parser.AdResponseParserVast; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.vast.VASTErrorCodes; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + public class VastParserExtractor { private static final String TAG = VastParserExtractor.class.getSimpleName(); @@ -96,7 +96,7 @@ private void performVastUnwrap(String vast) { adResponseParserVast = new AdResponseParserVast(vast); } catch (VastParseError e) { - OXLog.error(TAG, "AdResponseParserVast creation failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "AdResponseParserVast creation failed: " + Log.getStackTraceString(e)); final AdException adException = new AdException(AdException.INTERNAL_ERROR, e.getMessage()); mListener.onResult(createExtractorFailureResult(adException)); @@ -106,12 +106,12 @@ private void performVastUnwrap(String vast) { // Check if this is the response from the initial request or from unwrapping a wrapper if (mRootVastParser == null) { // If mRootVastParser doesn't exist then it is the initial VAST request - OXLog.debug(TAG, "Initial VAST Request"); + LogUtil.debug(TAG, "Initial VAST Request"); mRootVastParser = adResponseParserVast; } else { // Otherwise, this is the result of unwrapping a Wrapper. - OXLog.debug(TAG, "Unwrapping VAST Wrapper"); + LogUtil.debug(TAG, "Unwrapping VAST Wrapper"); mLatestVastWrapperParser.setWrapper(adResponseParserVast); } @@ -139,7 +139,7 @@ private void performVastUnwrap(String vast) { } private void failedToLoadAd(String msg) { - OXLog.error(TAG, "Invalid ad response: " + msg); + LogUtil.error(TAG, "Invalid ad response: " + msg); final AdException adException = new AdException(AdException.INTERNAL_ERROR, "Invalid ad response: " + msg); mListener.onResult(createExtractorFailureResult(adException)); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/AbstractCreative.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/AbstractCreative.java index ff1e59a6e..b120119ec 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/AbstractCreative.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/AbstractCreative.java @@ -25,7 +25,7 @@ import org.prebid.mobile.rendering.models.internal.InternalFriendlyObstruction; import org.prebid.mobile.rendering.models.internal.InternalPlayerState; import org.prebid.mobile.rendering.session.manager.OmAdSessionManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.VideoAdEvent; import org.prebid.mobile.rendering.views.AdViewManager; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; @@ -87,35 +87,35 @@ public AbstractCreative(Context context, CreativeModel model, OmAdSessionManager * Pause creative execution */ public void pause() { - OXLog.debug(TAG, "pause(): Base method implementation: ignoring"); + LogUtil.debug(TAG, "pause(): Base method implementation: ignoring"); } /** * Resume creative execution */ public void resume() { - OXLog.debug(TAG, "resume(): Base method implementation: ignoring"); + LogUtil.debug(TAG, "resume(): Base method implementation: ignoring"); } /** * UnMute creative */ public void unmute() { - OXLog.debug(TAG, "unMute(): Base method implementation: ignoring"); + LogUtil.debug(TAG, "unMute(): Base method implementation: ignoring"); } /** * Mute creative */ public void mute() { - OXLog.debug(TAG, "mute(): Base method implementation: ignoring"); + LogUtil.debug(TAG, "mute(): Base method implementation: ignoring"); } /** * @return Whether the creative is playing */ public boolean isPlaying() { - OXLog.debug(TAG, "isPlaying(): Returning default value: false"); + LogUtil.debug(TAG, "isPlaying(): Returning default value: false"); return false; } @@ -125,14 +125,14 @@ public boolean isPlaying() { * @param state to track */ public void trackVideoStateChange(InternalPlayerState state) { - OXLog.debug(TAG, "trackVideoStateChange: Base method implementation: ignoring"); + LogUtil.debug(TAG, "trackVideoStateChange: Base method implementation: ignoring"); } /** * @return if current creative is serving as interstitial that was closed */ public boolean isInterstitialClosed() { - OXLog.debug(TAG, "isInterstitialClosed(): Returning default value: false"); + LogUtil.debug(TAG, "isInterstitialClosed(): Returning default value: false"); return false; } @@ -140,7 +140,7 @@ public boolean isInterstitialClosed() { * @return media duration in ms */ public long getMediaDuration() { - OXLog.debug(TAG, "getMediaDuration(): Returning default value: 0"); + LogUtil.debug(TAG, "getMediaDuration(): Returning default value: 0"); return 0; } @@ -148,7 +148,7 @@ public long getMediaDuration() { * @return video skip offset in ms */ public long getVideoSkipOffset() { - OXLog.debug(TAG, "getVideoSkipOffset(): Returning default value: -1"); + LogUtil.debug(TAG, "getVideoSkipOffset(): Returning default value: -1"); return AdConfiguration.SKIP_OFFSET_NOT_ASSIGNED; } @@ -156,7 +156,7 @@ public long getVideoSkipOffset() { * VideoAdEvent.Event to track */ public void trackVideoEvent(VideoAdEvent.Event event) { - OXLog.debug(TAG, "trackVideoEvent(): Base method implementation: ignoring"); + LogUtil.debug(TAG, "trackVideoEvent(): Base method implementation: ignoring"); } /** @@ -219,7 +219,7 @@ public void destroy() { */ public void changeVisibilityTrackerState(boolean adWebViewWindowFocus) { if (mCreativeVisibilityTracker == null) { - OXLog.debug(TAG, "handleAdWebViewWindowFocusChange(): Failed. CreativeVisibilityTracker is null."); + LogUtil.debug(TAG, "handleAdWebViewWindowFocusChange(): Failed. CreativeVisibilityTracker is null."); return; } @@ -271,7 +271,7 @@ public CreativeModel getCreativeModel() { public void updateAdView(View view) { OmAdSessionManager omAdSessionManager = mWeakOmAdSessionManager.get(); if (omAdSessionManager == null) { - OXLog.error(TAG, "Unable to updateAdView. OmAdSessionManager is null"); + LogUtil.error(TAG, "Unable to updateAdView. OmAdSessionManager is null"); return; } omAdSessionManager.registerAdView(view); @@ -283,13 +283,13 @@ public CreativeViewListener getCreativeViewListener() { public void addOmFriendlyObstruction(InternalFriendlyObstruction friendlyObstruction) { if (friendlyObstruction == null) { - OXLog.debug(TAG, "addOmFriendlyObstruction: Obstruction view is null. Skip adding as friendlyObstruction"); + LogUtil.debug(TAG, "addOmFriendlyObstruction: Obstruction view is null. Skip adding as friendlyObstruction"); return; } OmAdSessionManager omAdSessionManager = mWeakOmAdSessionManager.get(); if (omAdSessionManager == null) { - OXLog.error(TAG, "Unable to addOmFriendlyObstruction. OmAdSessionManager is null"); + LogUtil.error(TAG, "Unable to addOmFriendlyObstruction. OmAdSessionManager is null"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModel.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModel.java index 1c25a91cb..1567fbb78 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModel.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModel.java @@ -16,17 +16,17 @@ package org.prebid.mobile.rendering.models; -import androidx.annotation.Nullable; - import org.prebid.mobile.rendering.networking.tracking.TrackingManager; import org.prebid.mobile.rendering.session.manager.OmAdSessionManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.OmEventTracker; import org.prebid.mobile.rendering.video.VideoAdEvent; import java.util.ArrayList; import java.util.HashMap; +import androidx.annotation.Nullable; + // CreativeModel is visible to the publisher, and defines: // --- displayDurationInSeconds indicates the time the creative will display for // -------- A negative value indicates that this field has not been set @@ -104,7 +104,7 @@ public void trackEventNamed(TrackingEvent.Events event) { ArrayList trackingUrls = mTrackingURLs.get(event); if (trackingUrls == null || trackingUrls.isEmpty()) { - OXLog.debug(TAG, "Event" + event + ": url not found for tracking"); + LogUtil.debug(TAG, "Event" + event + ": url not found for tracking"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModelMakerBids.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModelMakerBids.java index 6f865aadf..1f96cc137 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModelMakerBids.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModelMakerBids.java @@ -18,8 +18,6 @@ import android.text.TextUtils; -import androidx.annotation.NonNull; - import org.prebid.mobile.rendering.bidding.data.bid.Bid; import org.prebid.mobile.rendering.bidding.data.bid.BidResponse; import org.prebid.mobile.rendering.bidding.data.bid.Prebid; @@ -30,11 +28,13 @@ import org.prebid.mobile.rendering.models.ntv.NativeAdConfiguration; import org.prebid.mobile.rendering.networking.tracking.TrackingManager; import org.prebid.mobile.rendering.utils.helpers.MacrosResolutionHelper; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.OmEventTracker; import java.util.ArrayList; +import androidx.annotation.NonNull; + public class CreativeModelMakerBids { private static final String TAG = CreativeModelMakerBids.class.getSimpleName(); @@ -116,7 +116,7 @@ private String getAdHtml(AdConfiguration adConfiguration, Bid bid) { String html = ""; if (bid == null) { - OXLog.error(TAG, "getAdHtml: Failed. Bid is null. Returning empty string."); + LogUtil.error(TAG, "getAdHtml: Failed. Bid is null. Returning empty string."); return html; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModelsMakerVast.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModelsMakerVast.java index e6fa7cdf6..4748295c0 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModelsMakerVast.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeModelsMakerVast.java @@ -16,15 +16,13 @@ package org.prebid.mobile.rendering.models; -import androidx.annotation.NonNull; - import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.loading.AdLoadListener; import org.prebid.mobile.rendering.networking.tracking.TrackingManager; import org.prebid.mobile.rendering.parser.AdResponseParserBase; import org.prebid.mobile.rendering.parser.AdResponseParserVast; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.OmEventTracker; import org.prebid.mobile.rendering.video.VideoAdEvent; import org.prebid.mobile.rendering.video.VideoCreativeModel; @@ -36,6 +34,8 @@ import java.util.ArrayList; +import androidx.annotation.NonNull; + import static org.prebid.mobile.rendering.parser.AdResponseParserVast.RESOURCE_FORMAT_HTML; import static org.prebid.mobile.rendering.parser.AdResponseParserVast.RESOURCE_FORMAT_IFRAME; import static org.prebid.mobile.rendering.parser.AdResponseParserVast.RESOURCE_FORMAT_STATIC; @@ -215,7 +215,7 @@ private void makeModelsContinued() { mListener.onCreativeModelReady(result); } catch (Exception e) { - OXLog.error(TAG, "Video failed with: " + e.getMessage()); + LogUtil.error(TAG, "Video failed with: " + e.getMessage()); notifyErrorListener("Video failed: " + e.getMessage()); } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeVisibilityTracker.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeVisibilityTracker.java index f02bdfe18..1a2bb6b88 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeVisibilityTracker.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/CreativeVisibilityTracker.java @@ -22,16 +22,12 @@ import android.view.View; import android.view.ViewTreeObserver; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.models.internal.VisibilityTrackerOption; import org.prebid.mobile.rendering.models.internal.VisibilityTrackerResult; import org.prebid.mobile.rendering.utils.exposure.ViewExposure; import org.prebid.mobile.rendering.utils.exposure.ViewExposureChecker; import org.prebid.mobile.rendering.utils.helpers.VisibilityChecker; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.mraid.Views; import java.lang.ref.WeakReference; @@ -40,6 +36,10 @@ import java.util.List; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + public class CreativeVisibilityTracker { private static final String TAG = CreativeVisibilityTracker.class.getSimpleName(); @@ -67,7 +67,7 @@ public CreativeVisibilityTracker( final View trackedView, final Set visibilityTrackerOptionSet) { if (trackedView == null) { - OXLog.debug(TAG, "Tracked view can't be null"); + LogUtil.debug(TAG, "Tracked view can't be null"); return; } @@ -120,20 +120,20 @@ private void setViewTreeObserver( final View view) { final ViewTreeObserver originalViewTreeObserver = mWeakViewTreeObserver.get(); if (originalViewTreeObserver != null && originalViewTreeObserver.isAlive()) { - OXLog.debug(TAG, "Original ViewTreeObserver is still alive."); + LogUtil.debug(TAG, "Original ViewTreeObserver is still alive."); return; } final View rootView = Views.getTopmostView(context, view); if (rootView == null) { - OXLog.debug(TAG, "Unable to set Visibility Tracker due to no available root view."); + LogUtil.debug(TAG, "Unable to set Visibility Tracker due to no available root view."); return; } final ViewTreeObserver viewTreeObserver = rootView.getViewTreeObserver(); if (!viewTreeObserver.isAlive()) { - OXLog.debug(TAG, "Visibility Tracker was unable to track views because the" - + " root view tree observer was not alive"); + LogUtil.debug(TAG, "Visibility Tracker was unable to track views because the" + + " root view tree observer was not alive"); return; } @@ -149,7 +149,7 @@ public void setVisibilityTrackerListener( public void startVisibilityCheck(Context context) { if (mTrackedView == null || mTrackedView.get() == null) { - OXLog.error(TAG, "Couldn't start visibility check. Target view is null"); + LogUtil.error(TAG, "Couldn't start visibility check. Target view is null"); return; } setViewTreeObserver(context, mTrackedView.get()); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/HTMLCreative.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/HTMLCreative.java index e94329a55..50e2ff3c5 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/HTMLCreative.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/HTMLCreative.java @@ -32,7 +32,7 @@ import org.prebid.mobile.rendering.mraid.methods.MraidController; import org.prebid.mobile.rendering.session.manager.OmAdSessionManager; import org.prebid.mobile.rendering.utils.exposure.ViewExposure; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import org.prebid.mobile.rendering.views.webview.PrebidWebViewBanner; import org.prebid.mobile.rendering.views.webview.PrebidWebViewBase; @@ -109,7 +109,7 @@ else if (adType == AdConfiguration.AdUnitIdentifierType.INTERSTITIAL) { if (TextUtils.isEmpty(html)) { String msg = "No HTML in creative data"; - OXLog.error(TAG, msg); + LogUtil.error(TAG, msg); throw new AdException(AdException.SERVER_ERROR, msg); } else { @@ -125,7 +125,7 @@ else if (adType == AdConfiguration.AdUnitIdentifierType.INTERSTITIAL) { public void display() { if (!(getCreativeView() instanceof PrebidWebViewBase)) { - OXLog.error(TAG, "Could not cast mCreativeView to a PrebidWebViewBase"); + LogUtil.error(TAG, "Could not cast mCreativeView to a PrebidWebViewBase"); return; } PrebidWebViewBase creativeWebView = (PrebidWebViewBase) getCreativeView(); @@ -137,13 +137,13 @@ public void display() { @Override public void createOmAdSession() { if (getCreativeView() == null || getCreativeView().getWebView() == null) { - OXLog.error(TAG, "initOmAdSession error. Opex webView is null"); + LogUtil.error(TAG, "initOmAdSession error. Opex webView is null"); return; } OmAdSessionManager omAdSessionManager = mWeakOmAdSessionManager.get(); if (omAdSessionManager == null) { - OXLog.error(TAG, "Error creating adSession. OmAdSessionManager is null"); + LogUtil.error(TAG, "Error creating adSession. OmAdSessionManager is null"); return; } @@ -220,7 +220,7 @@ public void webViewShouldOpenMRAIDLink(String url) { @Override public void interstitialAdClosed() { - OXLog.debug(TAG, "MRAID Expand/Resize is closing."); + LogUtil.debug(TAG, "MRAID Expand/Resize is closing."); //For mraid banner, this is same as mraidAdCollapsed //For mraid interstitials with custom if (getCreativeViewListener() != null) { @@ -232,7 +232,7 @@ public void interstitialAdClosed() { public void interstitialDialogShown(ViewGroup rootViewGroup) { CreativeViewListener creativeViewListener = getCreativeViewListener(); if (creativeViewListener == null) { - OXLog.debug(TAG, "interstitialDialogShown(): Failed to notify creativeViewListener. creativeViewListener is null."); + LogUtil.debug(TAG, "interstitialDialogShown(): Failed to notify creativeViewListener. creativeViewListener is null."); return; } creativeViewListener.creativeInterstitialDialogShown(rootViewGroup); @@ -252,7 +252,7 @@ public PrebidWebViewBase getCreativeView() { } public void mraidAdExpanded() { - OXLog.debug(TAG, "MRAID ad expanded"); + LogUtil.debug(TAG, "MRAID ad expanded"); //send callback to pubs when an internal browser is closed if (getCreativeViewListener() != null) { getCreativeViewListener().creativeDidExpand(this); @@ -266,7 +266,7 @@ void onVisibilityEvent(VisibilityTrackerResult result) { ViewExposure viewExposure = result.getViewExposure(); if (shouldFireImpression && isViewable) { - OXLog.debug(TAG, "Impression fired"); + LogUtil.debug(TAG, "Impression fired"); getCreativeModel().trackDisplayAdEvent(TrackingEvent.Events.IMPRESSION); } getCreativeView().onWindowFocusChanged(isViewable); @@ -303,7 +303,7 @@ public void destroy() { } public void mraidAdCollapsed() { - OXLog.debug(TAG, "MRAID ad collapsed"); + LogUtil.debug(TAG, "MRAID ad collapsed"); if (getCreativeViewListener() != null) { getCreativeViewListener().creativeDidCollapse(this); } @@ -326,13 +326,13 @@ private String injectingScriptContent(String html) { try { OmAdSessionManager omAdSessionManager = mWeakOmAdSessionManager.get(); if (omAdSessionManager == null) { - OXLog.debug(TAG, "Unable to injectScriptContent. AdSessionManager is null."); + LogUtil.debug(TAG, "Unable to injectScriptContent. AdSessionManager is null."); return html; } return omAdSessionManager.injectValidationScriptIntoHtml(html); } catch (IllegalArgumentException | IllegalStateException e) { - OXLog.error(TAG, "Failed to inject script content into html " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to inject script content into html " + Log.getStackTraceString(e)); return html; } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/internal/MraidVariableContainer.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/internal/MraidVariableContainer.java index f2fd35ab4..62c54d942 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/internal/MraidVariableContainer.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/models/internal/MraidVariableContainer.java @@ -19,7 +19,7 @@ import android.text.TextUtils; import org.prebid.mobile.rendering.utils.helpers.MraidUtils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; public class MraidVariableContainer { private static final String TAG = MraidVariableContainer.class.getSimpleName(); @@ -133,7 +133,7 @@ public static void setDisabledSupportFlags(int flags) { } disabledFlags.append("};"); - OXLog.debug(TAG, "Supported features: " + disabledFlags.toString()); + LogUtil.debug(TAG, "Supported features: " + disabledFlags.toString()); setDisabledFlags(disabledFlags.toString()); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidClose.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidClose.java index f2c1c78b7..71960b1df 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidClose.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidClose.java @@ -24,7 +24,7 @@ import android.view.View; import android.widget.FrameLayout; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.browser.AdBrowserActivity; import org.prebid.mobile.rendering.views.webview.PrebidWebViewBase; import org.prebid.mobile.rendering.views.webview.WebViewBanner; @@ -48,7 +48,7 @@ public MraidClose(Context context, BaseJSInterface jsInterface, WebViewBase adBa public void closeThroughJS() { final Context context = mContext; if (context == null) { - OXLog.error(TAG, "Context is null"); + LogUtil.error(TAG, "Context is null"); return; } @@ -59,7 +59,7 @@ public void closeThroughJS() { WebViewBase webViewBase = mWebViewBase; if (isContainerStateInvalid(state)) { - OXLog.debug(TAG, "closeThroughJS: Skipping. Wrong container state: " + state); + LogUtil.debug(TAG, "closeThroughJS: Skipping. Wrong container state: " + state); return; } @@ -70,7 +70,7 @@ public void closeThroughJS() { } } catch (Exception e) { - OXLog.error(TAG, "closeThroughJS failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "closeThroughJS failed: " + Log.getStackTraceString(e)); } }); } @@ -135,7 +135,7 @@ private void makeViewInvisible() { Handler handler = new Handler(Looper.getMainLooper()); handler.post(() -> { if (mWebViewBase == null) { - OXLog.error(TAG, "makeViewInvisible failed: webViewBase is null"); + LogUtil.error(TAG, "makeViewInvisible failed: webViewBase is null"); return; } mWebViewBase.setVisibility(View.INVISIBLE); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidController.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidController.java index 4a091d9a5..beb5507f2 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidController.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidController.java @@ -22,21 +22,21 @@ import android.util.Log; import android.view.View; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.models.AdConfiguration; import org.prebid.mobile.rendering.models.HTMLCreative; import org.prebid.mobile.rendering.models.internal.MraidEvent; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import org.prebid.mobile.rendering.views.webview.PrebidWebViewBase; import org.prebid.mobile.rendering.views.webview.WebViewBase; import org.prebid.mobile.rendering.views.webview.mraid.BaseJSInterface; import org.prebid.mobile.rendering.views.webview.mraid.JSInterface; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import static org.prebid.mobile.rendering.views.webview.mraid.JSInterface.ACTION_CLOSE; import static org.prebid.mobile.rendering.views.webview.mraid.JSInterface.ACTION_CREATE_CALENDAR_EVENT; import static org.prebid.mobile.rendering.views.webview.mraid.JSInterface.ACTION_EXPAND; @@ -132,7 +132,7 @@ public void handleMraidEvent(MraidEvent event, HTMLCreative creative, switch (event.mraidAction) { case ACTION_EXPAND: if (Utils.isBlank(event.mraidActionHelper)) { - OXLog.debug(TAG, "One part expand"); + LogUtil.debug(TAG, "One part expand"); expand(oldWebViewBase, twoPartNewWebViewBase, event); } else { @@ -182,7 +182,7 @@ public void changeOrientation() { mMraidExpand.getInterstitialViewController().handleSetOrientationProperties(); } catch (AdException e) { - OXLog.error(TAG, Log.getStackTraceString(e)); + LogUtil.error(TAG, Log.getStackTraceString(e)); } } } @@ -299,7 +299,7 @@ protected void initMraidExpand(final View adBaseView, Handler handler = new Handler(Looper.getMainLooper()); handler.post(() -> { try { - OXLog.debug(TAG, "mraidExpand"); + LogUtil.debug(TAG, "mraidExpand"); //send click event on expand ((WebViewBase) adBaseView).sendClickCallBack(mraidEvent.mraidActionHelper); mMraidExpand.expand(mraidEvent.mraidActionHelper, () -> { @@ -312,7 +312,7 @@ protected void initMraidExpand(final View adBaseView, }); } catch (Exception e) { - OXLog.error(TAG, "mraidExpand failed at displayViewInInterstitial: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "mraidExpand failed at displayViewInInterstitial: " + Log.getStackTraceString(e)); } }); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidEventHandlerNotifierRunnable.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidEventHandlerNotifierRunnable.java index 3efbbbda6..dac05ca12 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidEventHandlerNotifierRunnable.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidEventHandlerNotifierRunnable.java @@ -18,7 +18,7 @@ import org.prebid.mobile.rendering.models.HTMLCreative; import org.prebid.mobile.rendering.models.internal.MraidEvent; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.WebViewBase; import org.prebid.mobile.rendering.views.webview.mraid.JsExecutor; @@ -48,14 +48,14 @@ public void run() { HTMLCreative htmlCreative = mWeakHtmlCreative.get(); WebViewBase webViewBase = mWeakWebViewBase.get(); if (htmlCreative == null || webViewBase == null) { - OXLog.debug(TAG, "Unable to pass event to handler. HtmlCreative or webviewBase is null"); + LogUtil.debug(TAG, "Unable to pass event to handler. HtmlCreative or webviewBase is null"); return; } htmlCreative.handleMRAIDEventsInCreative(mMraidEvent, webViewBase); final JsExecutor jsExecutor = mWeakJsExecutor.get(); if (jsExecutor == null) { - OXLog.debug(TAG, "Unable to executeNativeCallComplete(). JsExecutor is null."); + LogUtil.debug(TAG, "Unable to executeNativeCallComplete(). JsExecutor is null."); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidExpand.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidExpand.java index 0558ac4f3..e97c3f08d 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidExpand.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidExpand.java @@ -29,7 +29,7 @@ import org.prebid.mobile.rendering.models.internal.MraidVariableContainer; import org.prebid.mobile.rendering.mraid.methods.network.RedirectUrlListener; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import org.prebid.mobile.rendering.views.webview.WebViewBase; import org.prebid.mobile.rendering.views.webview.mraid.BaseJSInterface; @@ -72,7 +72,7 @@ public void onSuccess(final String url, String contentType) { @Override public void onFailed() { - OXLog.debug(TAG, "Expand failed"); + LogUtil.debug(TAG, "Expand failed"); // Nothing to do } }); @@ -124,7 +124,7 @@ public void setMraidExpanded(boolean mraidExpanded) { private void performExpand(String url, CompletedCallBack completedCallBack) { final Context context = mContext; if (context == null) { - OXLog.error(TAG, "Context is null"); + LogUtil.error(TAG, "Context is null"); return; } @@ -136,7 +136,7 @@ private void performExpand(String url, CompletedCallBack completedCallBack) { String state = mraidVariableContainer.getCurrentState(); if (isContainerStateInvalid(state)) { - OXLog.debug(TAG, "handleExpand: Skipping. Wrong container state: " + state); + LogUtil.debug(TAG, "handleExpand: Skipping. Wrong container state: " + state); return; } @@ -149,7 +149,7 @@ private void performExpand(String url, CompletedCallBack completedCallBack) { showExpandDialog(context, completedCallBack); } catch (Exception e) { - OXLog.error(TAG, "Expand failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Expand failed: " + Log.getStackTraceString(e)); } }); } @@ -164,7 +164,7 @@ private boolean isContainerStateInvalid(String state) { @VisibleForTesting void showExpandDialog(Context context, CompletedCallBack completedCallBack) { if (!(context instanceof Activity) || ((Activity) context).isFinishing()) { - OXLog.error(TAG, "Context is not activity or activity is finishing, can not show expand dialog"); + LogUtil.error(TAG, "Context is not activity or activity is finishing, can not show expand dialog"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidPlayVideo.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidPlayVideo.java index 79f584715..49cded2d2 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidPlayVideo.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidPlayVideo.java @@ -19,7 +19,7 @@ import android.text.TextUtils; import org.prebid.mobile.rendering.sdk.ManagersResolver; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; public class MraidPlayVideo { @@ -28,7 +28,7 @@ public class MraidPlayVideo { public void playVideo(String url) { if (TextUtils.isEmpty(url)) { - OXLog.error(TAG, "playVideo(): Failed. Provided url is empty or null"); + LogUtil.error(TAG, "playVideo(): Failed. Provided url is empty or null"); return; } ManagersResolver.getInstance().getDeviceManager().playVideo(url); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidResize.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidResize.java index 6b6b0f1a7..a6d65e7ca 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidResize.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidResize.java @@ -33,7 +33,7 @@ import org.prebid.mobile.rendering.mraid.handler.FetchPropertiesHandler; import org.prebid.mobile.rendering.utils.helpers.Dips; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import org.prebid.mobile.rendering.views.webview.WebViewBase; import org.prebid.mobile.rendering.views.webview.mraid.BaseJSInterface; @@ -65,7 +65,7 @@ public void onResult(String propertyJson) { @Override public void onError(Throwable throwable) { - OXLog.error(TAG, "executeGetResizeProperties failed: " + Log.getStackTraceString(throwable)); + LogUtil.error(TAG, "executeGetResizeProperties failed: " + Log.getStackTraceString(throwable)); } }; @@ -86,7 +86,7 @@ public MraidResize(Context context, public void resize() { final String state = mJsInterface.getMraidVariableContainer().getCurrentState(); if (isContainerStateInvalid(state)) { - OXLog.debug(TAG, "resize: Skipping. Wrong container state: " + state); + LogUtil.debug(TAG, "resize: Skipping. Wrong container state: " + state); return; } else if (state.equals(JSInterface.STATE_EXPANDED)) { @@ -109,7 +109,7 @@ private void initCloseView() { mCloseView = Utils.createCloseView(mContextReference.get()); if (mCloseView == null) { - OXLog.error(TAG, "Error initializing close view. Close view is null"); + LogUtil.error(TAG, "Error initializing close view. Close view is null"); return; } mAdBaseView.post(() -> { @@ -128,13 +128,13 @@ private void showExpandDialog(final int widthDips, final int heightDips, final i mAdBaseView.post((() -> { try { if (mAdBaseView == null) { - OXLog.error(TAG, "Resize failed. Webview is null"); + LogUtil.error(TAG, "Resize failed. Webview is null"); mJsInterface.onError("Unable to resize after webview is destroyed", JSInterface.ACTION_RESIZE); return; } Context context = mContextReference.get(); if (context == null) { - OXLog.error(TAG, "Resize failed. Context is null"); + LogUtil.error(TAG, "Resize failed. Context is null"); mJsInterface.onError("Unable to resize when mContext is null", JSInterface.ACTION_RESIZE); return; } @@ -161,7 +161,7 @@ else if (JSInterface.STATE_RESIZED.equals(state)) { mInterstitialManager.interstitialDialogShown(mSecondaryAdContainer); } catch (Exception e) { - OXLog.error(TAG, "Resize failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Resize failed: " + Log.getStackTraceString(e)); } }) ); @@ -271,7 +271,7 @@ private Rect getResizeRect(int widthDips, int heightDips, int offsetXDips, int o + widthDips + ", " + height + ") and offset (" + offsetXDips + ", " + offsetYDips + ") that don't allow the close region to appear " + "within the resized ad."; - OXLog.error(TAG, err); + LogUtil.error(TAG, err); mJsInterface.onError("Resize properties specified a size & offset that does not allow the close region to appear within the resized ad", JSInterface.ACTION_RESIZE); return null; } @@ -281,7 +281,7 @@ private Rect getResizeRect(int widthDips, int heightDips, int offsetXDips, int o private Pair getCloseViewWidthHeight() { if (mCloseView == null) { - OXLog.error(TAG, "Unable to retrieve width height from close view. Close view is null."); + LogUtil.error(TAG, "Unable to retrieve width height from close view. Close view is null."); return new Pair<>(0, 0); } @@ -307,10 +307,10 @@ private void handleResizePropertiesResult(String propertyJson) { allowOffscreen = resizeProperties.optBoolean("allowOffscreen", true); } catch (JSONException e) { - OXLog.error(TAG, "Failed to get resize values from JSON for MRAID: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to get resize values from JSON for MRAID: " + Log.getStackTraceString(e)); } - OXLog.debug(TAG, "resize: x, y, width, height: " + offsetX + " " + offsetY + " " + twidth + " " + theight); + LogUtil.debug(TAG, "resize: x, y, width, height: " + offsetX + " " + offsetY + " " + twidth + " " + theight); showExpandDialog(twidth, theight, offsetX, offsetY, allowOffscreen); } @@ -322,7 +322,7 @@ private void sendError(int widthDips, int heightDips, int offsetXDips, int offse + " region to appear within the max allowed size (" + mScreenMetrics.getRootViewRectDips().width() + ", " + mScreenMetrics.getRootViewRectDips().height() + ")"; - OXLog.error(TAG, err); + LogUtil.error(TAG, err); } private boolean isContainerStateInvalid(String state) { diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidStorePicture.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidStorePicture.java index 1dfee2a5d..ce462a1dc 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidStorePicture.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidStorePicture.java @@ -25,7 +25,7 @@ import org.prebid.mobile.rendering.sdk.ManagersResolver; import org.prebid.mobile.rendering.sdk.deviceData.managers.DeviceInfoManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.WebViewBase; import org.prebid.mobile.rendering.views.webview.mraid.BaseJSInterface; import org.prebid.mobile.rendering.views.webview.mraid.JSInterface; @@ -70,7 +70,7 @@ public void storePicture(String url) { dialog.show(); } else { - OXLog.error(TAG, "Context is not activity or activity is finishing, can not show expand dialog"); + LogUtil.error(TAG, "Context is not activity or activity is finishing, can not show expand dialog"); } }); } @@ -91,7 +91,7 @@ private void storePicture() { catch (Exception e) { //send a mraid error back to the ad mJsi.onError("Failed to store picture", JSInterface.ACTION_STORE_PICTURE); - OXLog.error(TAG, "Failed to store picture: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to store picture: " + Log.getStackTraceString(e)); } }).start(); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidUrlHandler.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidUrlHandler.java index a71823832..747327a0f 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidUrlHandler.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidUrlHandler.java @@ -18,9 +18,7 @@ import android.content.Context; -import androidx.annotation.VisibleForTesting; - -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.utils.url.UrlHandler; import org.prebid.mobile.rendering.utils.url.action.DeepLinkAction; import org.prebid.mobile.rendering.utils.url.action.DeepLinkPlusAction; @@ -28,6 +26,8 @@ import org.prebid.mobile.rendering.utils.url.action.UrlAction; import org.prebid.mobile.rendering.views.webview.mraid.BaseJSInterface; +import androidx.annotation.VisibleForTesting; + public class MraidUrlHandler { public static final String TAG = MraidUrlHandler.class.getSimpleName(); @@ -75,7 +75,7 @@ public void onSuccess(String url, UrlAction urlAction) { @Override public void onFailure(String url) { mUrlHandleInProgress = false; - OXLog.debug(TAG, "Failed to handleUrl: " + url); + LogUtil.debug(TAG, "Failed to handleUrl: " + url); } }) .build(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/TwoPartExpandRunnable.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/TwoPartExpandRunnable.java index c4abc2af8..8148dd188 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/TwoPartExpandRunnable.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/TwoPartExpandRunnable.java @@ -18,7 +18,7 @@ import org.prebid.mobile.rendering.models.HTMLCreative; import org.prebid.mobile.rendering.models.internal.MraidEvent; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.PrebidWebViewBanner; import org.prebid.mobile.rendering.views.webview.PrebidWebViewBase; import org.prebid.mobile.rendering.views.webview.WebViewBase; @@ -47,7 +47,7 @@ public class TwoPartExpandRunnable implements Runnable { public void run() { HTMLCreative htmlCreative = mWeakHtmlCreative.get(); if (htmlCreative == null) { - OXLog.error(TAG, "HTMLCreative object is null"); + LogUtil.error(TAG, "HTMLCreative object is null"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/network/UrlResolutionTask.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/network/UrlResolutionTask.java index 3b2730ab7..13d6a198e 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/network/UrlResolutionTask.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/mraid/methods/network/UrlResolutionTask.java @@ -18,12 +18,8 @@ import android.os.AsyncTask; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.sdk.PrebidRenderingSettings; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.io.IOException; import java.io.InputStream; @@ -32,6 +28,10 @@ import java.net.URISyntaxException; import java.net.URL; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + @VisibleForTesting public class UrlResolutionTask extends AsyncTask { private static final String TAG = UrlResolutionTask.class.getSimpleName(); @@ -100,7 +100,7 @@ private String getRedirectLocation(@NonNull final String urlString) throws IOExc } } catch (IOException e) { - OXLog.error(TAG, "IOException when closing httpUrlConnection. Ignoring."); + LogUtil.error(TAG, "IOException when closing httpUrlConnection. Ignoring."); } httpUrlConnection.disconnect(); } @@ -125,11 +125,11 @@ static String resolveRedirectLocation(@NonNull final String baseUrl, } catch (IllegalArgumentException e) { // Ensure the request is cancelled instead of resolving an intermediary URL - OXLog.error(TAG, "Invalid URL redirection. baseUrl=" + baseUrl + "\n redirectUrl=" + redirectUrl); + LogUtil.error(TAG, "Invalid URL redirection. baseUrl=" + baseUrl + "\n redirectUrl=" + redirectUrl); throw new URISyntaxException(redirectUrl, "Unable to parse invalid URL"); } catch (NullPointerException e) { - OXLog.error(TAG, "Invalid URL redirection. baseUrl=" + baseUrl + "\n redirectUrl=" + redirectUrl); + LogUtil.error(TAG, "Invalid URL redirection. baseUrl=" + baseUrl + "\n redirectUrl=" + redirectUrl); throw e; } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/BaseNetworkTask.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/BaseNetworkTask.java index 36108fb6f..57ab4aa42 100755 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/BaseNetworkTask.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/BaseNetworkTask.java @@ -18,13 +18,11 @@ import android.os.AsyncTask; -import androidx.annotation.Nullable; - import org.apache.http.conn.ConnectTimeoutException; import org.prebid.mobile.rendering.networking.exception.BaseExceptionHolder; import org.prebid.mobile.rendering.sdk.PrebidRenderingSettings; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.io.BufferedReader; import java.io.DataOutputStream; @@ -38,6 +36,8 @@ import java.net.URLConnection; import java.util.Locale; +import androidx.annotation.Nullable; + /** * Performs HTTP communication in the background, i.e. off the UI thread. */ @@ -84,16 +84,16 @@ protected GetUrlResult doInBackground(GetUrlParams... params) { @Override protected void onPostExecute(GetUrlResult urlResult) { if (urlResult == null) { - OXLog.debug(TAG, "URL result is null"); + LogUtil.debug(TAG, "URL result is null"); return; } if (mResponseHandler == null) { - OXLog.debug(TAG, "No ResponseHandler on: may be a tracking event"); + LogUtil.debug(TAG, "No ResponseHandler on: may be a tracking event"); return; } //For debugging purposes. Helps in client issues, if any. - OXLog.debug(TAG, "Result: " + urlResult.responseString); + LogUtil.debug(TAG, "Result: " + urlResult.responseString); long stop = System.currentTimeMillis(); long delta = stop - mStart; @@ -116,7 +116,7 @@ protected void onPostExecute(GetUrlResult urlResult) { @Override protected void onCancelled() { super.onCancelled(); - OXLog.debug(TAG, "Request cancelled. Disconnecting connection"); + LogUtil.debug(TAG, "Request cancelled. Disconnecting connection"); if (mConnection instanceof HttpURLConnection) { ((HttpURLConnection) mConnection).disconnect(); } @@ -133,8 +133,8 @@ public GetUrlResult customParser(int code, URLConnection urlConnection) { } public GetUrlResult sendRequest(GetUrlParams param) throws Exception { - OXLog.debug(TAG, "url: " + param.url); - OXLog.debug(TAG, "queryParams: " + param.queryParams); + LogUtil.debug(TAG, "url: " + param.url); + LogUtil.debug(TAG, "queryParams: " + param.queryParams); int responseCode = 0; mConnection = setHttpURLConnectionProperty(param); @@ -201,24 +201,24 @@ else if (validParams(params) && !isCancelled()) { mResult = sendRequest(param); } catch (MalformedURLException e) { - OXLog.warn(TAG, "Network Error: MalformedURLException" + e.getMessage()); + LogUtil.warn(TAG, "Network Error: MalformedURLException" + e.getMessage()); // This error will be handled in onPostExecute()- so no need to handle here - Nice mResult.setException(e); } catch (SocketTimeoutException e) { - OXLog.warn(TAG, "Network Error: SocketTimeoutException" + e.getMessage()); + LogUtil.warn(TAG, "Network Error: SocketTimeoutException" + e.getMessage()); mResult.setException(e); } catch (ConnectTimeoutException e) { - OXLog.warn(TAG, "Network Error: ConnectTimeoutException" + e.getMessage()); + LogUtil.warn(TAG, "Network Error: ConnectTimeoutException" + e.getMessage()); mResult.setException(e); } catch (IOException e) { - OXLog.warn(TAG, "Network Error: IOException" + e.getMessage()); + LogUtil.warn(TAG, "Network Error: IOException" + e.getMessage()); mResult.setException(e); } catch (Exception e) { - OXLog.warn(TAG, "Network Error: Exception" + e.getMessage()); + LogUtil.warn(TAG, "Network Error: Exception" + e.getMessage()); mResult.setException(e); } finally { @@ -287,7 +287,7 @@ private URLConnection openConnectionCheckRedirects(URLConnection connection) thr URL base = connection.getURL(); String location = connection.getHeaderField("Location"); - OXLog.debug(TAG, (location == null) + LogUtil.debug(TAG, (location == null) ? "not found location" : "location = " + location); URL target = null; @@ -303,7 +303,7 @@ private URLConnection openConnectionCheckRedirects(URLConnection connection) thr || target.getProtocol().equals("https")) || redirects >= MAX_REDIRECTS_COUNT) { String error = String.format("Bad server response - [HTTP Response code of %s]", status); - OXLog.error(TAG, error); + LogUtil.error(TAG, error); throw new Exception(error); } redirected = true; @@ -325,12 +325,12 @@ private GetUrlResult parseHttpURLResponse(int httpURLResponseCode) throws Except } else if (httpURLResponseCode >= 400 && httpURLResponseCode < 600) { String status = String.format(Locale.getDefault(), "Code %d. %s", httpURLResponseCode, readResponse(((HttpURLConnection) mConnection).getErrorStream())); - OXLog.error(TAG, status); + LogUtil.error(TAG, status); throw new Exception(status); } else { String error = String.format("Bad server response - [HTTP Response code of %s]", httpURLResponseCode); - OXLog.error(TAG, error); + LogUtil.error(TAG, error); throw new Exception(error); } mResult.responseString = response; diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/WinNotifier.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/WinNotifier.java index e327b4cc1..c6a38de60 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/WinNotifier.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/WinNotifier.java @@ -18,20 +18,20 @@ import android.text.TextUtils; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - import org.json.JSONException; import org.json.JSONObject; import org.prebid.mobile.rendering.bidding.data.bid.Bid; import org.prebid.mobile.rendering.bidding.data.bid.BidResponse; import org.prebid.mobile.rendering.networking.tracking.ServerConnection; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + public class WinNotifier { private static final String TAG = WinNotifier.class.getSimpleName(); @@ -66,13 +66,13 @@ public void onResponse(BaseNetworkTask.GetUrlResult response) { @Override public void onError(String msg, long responseTime) { - OXLog.error(TAG, "Failed to send win event: " + msg); + LogUtil.error(TAG, "Failed to send win event: " + msg); sendNextWinRequest(); } @Override public void onErrorWithException(Exception e, long responseTime) { - OXLog.error(TAG, "Failed to send win event: " + e.getMessage()); + LogUtil.error(TAG, "Failed to send win event: " + e.getMessage()); sendNextWinRequest(); } }; @@ -125,7 +125,7 @@ private void sendNextWinRequest() { } else { // Fire async event and wait for its result - OXLog.debug(TAG, "Bid.adm is null or empty. Getting the ad from prebid cache"); + LogUtil.debug(TAG, "Bid.adm is null or empty. Getting the ad from prebid cache"); ServerConnection.fireWithResult(winUrl, mWinResponseHandler); } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/modelcontrollers/Requester.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/modelcontrollers/Requester.java index 52c9b528e..726dafff6 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/modelcontrollers/Requester.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/modelcontrollers/Requester.java @@ -44,7 +44,7 @@ import org.prebid.mobile.rendering.utils.helpers.AdIdManager; import org.prebid.mobile.rendering.utils.helpers.AppInfoManager; import org.prebid.mobile.rendering.utils.helpers.ExternalViewerUtils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -132,7 +132,7 @@ protected void getAdId() { protected abstract PathBuilderBase getPathBuilder(); private void sendAdException(String logMsg, String exceptionMsg) { - OXLog.warn(TAG, logMsg); + LogUtil.warn(TAG, logMsg); AdException adException = new AdException(AdException.INIT_ERROR, exceptionMsg); mAdResponseCallBack.onErrorWithException(adException, 0); } @@ -150,7 +150,7 @@ protected void makeAdRequest() { // Check if device is connected to the internet ConnectionInfoManager connectionInfoManager = ManagersResolver.getInstance().getNetworkManager(); - if (connectionInfoManager == null || connectionInfoManager.getConnectionType() == UserParameters.OXMConnectionType.OFFLINE) { + if (connectionInfoManager == null || connectionInfoManager.getConnectionType() == UserParameters.ConnectionType.OFFLINE) { sendAdException( "Either Prebid networkManager is not initialized or Device is offline. Please check the internet connection", "No internet connection detected" @@ -189,20 +189,20 @@ public AdIdInitListener(Requester requester) { @Override public void adIdFetchCompletion() { - OXLog.info(TAG, "adIdFetchCompletion"); + LogUtil.info(TAG, "adIdFetchCompletion"); makeAdRequest(); } @Override public void adIdFetchFailure() { - OXLog.warn(TAG, "adIdFetchFailure"); + LogUtil.warn(TAG, "adIdFetchFailure"); makeAdRequest(); } private void makeAdRequest() { Requester requester = mWeakRequester.get(); if (requester == null) { - OXLog.warn(TAG, "Requester is null"); + LogUtil.warn(TAG, "Requester is null"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/AdRequestInput.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/AdRequestInput.java index c7675833d..4b9f124e6 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/AdRequestInput.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/AdRequestInput.java @@ -17,7 +17,7 @@ package org.prebid.mobile.rendering.networking.parameters; import org.prebid.mobile.rendering.models.openrtb.BidRequest; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -46,7 +46,7 @@ public AdRequestInput getDeepCopy() { newAdRequestInput.mBidRequest = (BidRequest) ois.readObject(); } catch (Exception e) { - OXLog.error(TAG, "Failed to make deep copy of bid request"); + LogUtil.error(TAG, "Failed to make deep copy of bid request"); return null; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/NetworkParameterBuilder.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/NetworkParameterBuilder.java index cc3c75d4a..8f740a78c 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/NetworkParameterBuilder.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/NetworkParameterBuilder.java @@ -49,7 +49,7 @@ public void appendBuilderParameters(AdRequestInput adRequestInput) { private void setNetworkParams(AdRequestInput adRequestInput, DeviceInfoManager deviceManager, ConnectionInfoManager connectionInfoManager) { if (deviceManager.isPermissionGranted("android.permission.ACCESS_NETWORK_STATE")) { - UserParameters.OXMConnectionType autoDetectedValue = connectionInfoManager.getConnectionType(); + UserParameters.ConnectionType autoDetectedValue = connectionInfoManager.getConnectionType(); switch (autoDetectedValue) { case WIFI: adRequestInput.getBidRequest().getDevice().connectiontype = CONNECTION_TYPE_WIFI; diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/UserParameters.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/UserParameters.java index 6557da8b6..8ddae208d 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/UserParameters.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/parameters/UserParameters.java @@ -33,7 +33,7 @@ private UserParameters() { /** * User gender. */ - public enum OXMGender { + public enum Gender { /** * User is male. */ @@ -50,7 +50,7 @@ public enum OXMGender { OTHER } - public static String getGenderDescription(OXMGender gender) { + public static String getGenderDescription(Gender gender) { String desc = null; switch (gender) { case MALE: @@ -69,7 +69,7 @@ public static String getGenderDescription(OXMGender gender) { /** * Device connection type. */ - public enum OXMConnectionType { + public enum ConnectionType { /** * Device is off-line. */ diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/targeting/Targeting.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/targeting/Targeting.java index d3f2ac726..d07d09227 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/targeting/Targeting.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/targeting/Targeting.java @@ -18,8 +18,6 @@ import android.util.Pair; -import androidx.annotation.VisibleForTesting; - import org.json.JSONArray; import org.prebid.mobile.rendering.models.openrtb.bidRequests.Ext; import org.prebid.mobile.rendering.networking.parameters.UserParameters; @@ -32,6 +30,8 @@ import java.util.Map; import java.util.Set; +import androidx.annotation.VisibleForTesting; + public class Targeting { static final String KEY_AGE = "age"; static final String KEY_GENDER = "gen"; @@ -123,7 +123,7 @@ public static String getUserCustomData() { * * @param gender the new user gender */ - public static void setUserGender(UserParameters.OXMGender gender) { + public static void setUserGender(UserParameters.Gender gender) { putTargetingValue(KEY_GENDER, UserParameters.getGenderDescription(gender)); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/tracking/ImpressionUrlTask.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/tracking/ImpressionUrlTask.java index 0b9192f5e..d2402a5ca 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/tracking/ImpressionUrlTask.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/tracking/ImpressionUrlTask.java @@ -19,7 +19,7 @@ import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.networking.BaseNetworkTask; import org.prebid.mobile.rendering.networking.BaseResponseHandler; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.io.IOException; import java.net.HttpURLConnection; @@ -42,7 +42,7 @@ public GetUrlResult customParser(int code, URLConnection urlConnection) { result = openConnectionCheckRedirects(urlConnection); } catch (Exception e) { - OXLog.error(TAG, "Redirection failed"); + LogUtil.error(TAG, "Redirection failed"); result = new GetUrlResult(); } return result; @@ -58,7 +58,7 @@ private GetUrlResult openConnectionCheckRedirects(URLConnection urlConnection) while (redir) { if (!(urlConnection instanceof HttpURLConnection)) { - OXLog.error(TAG, "Redirect fail for impression event"); + LogUtil.error(TAG, "Redirect fail for impression event"); return null; } @@ -95,7 +95,7 @@ else if (httpResponseCode == 200) { } else { String error = String.format("Redirect error - Bad server response - [HTTP Response code of %s]", httpResponseCode); - OXLog.error(TAG, error); + LogUtil.error(TAG, error); //Don't set exception on result. But instead just bail out with an error log throw new AdException(AdException.SERVER_ERROR, error); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/tracking/TrackingManager.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/tracking/TrackingManager.java index 0050d9325..7a4df3b8f 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/tracking/TrackingManager.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/tracking/TrackingManager.java @@ -16,13 +16,13 @@ package org.prebid.mobile.rendering.networking.tracking; -import androidx.annotation.Nullable; - -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.util.ArrayList; import java.util.List; +import androidx.annotation.Nullable; + public class TrackingManager { private static final String TAG = TrackingManager.class.getSimpleName(); @@ -46,7 +46,7 @@ public void fireEventTrackingURL(String url) { public void fireEventTrackingURLs(@Nullable List urls) { if (urls == null) { - OXLog.debug(TAG, "fireEventTrackingURLs(): Unable to execute event tracking requests. Provided list is null"); + LogUtil.debug(TAG, "fireEventTrackingURLs(): Unable to execute event tracking requests. Provided list is null"); return; } for (String url : urls) { diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/urlBuilder/BidUrlComponents.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/urlBuilder/BidUrlComponents.java index b906adc80..a85bef83d 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/urlBuilder/BidUrlComponents.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/urlBuilder/BidUrlComponents.java @@ -18,7 +18,7 @@ import org.json.JSONObject; import org.prebid.mobile.rendering.networking.parameters.AdRequestInput; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; public class BidUrlComponents extends URLComponents { private final static String TAG = BidUrlComponents.class.getSimpleName(); @@ -37,7 +37,7 @@ public String getQueryArgString() { } } catch (Exception e) { - OXLog.error(TAG, "Failed to add OpenRTB query arg"); + LogUtil.error(TAG, "Failed to add OpenRTB query arg"); } return openrtb; diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/urlBuilder/URLComponents.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/urlBuilder/URLComponents.java index 94ca7a863..290f87511 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/urlBuilder/URLComponents.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/networking/urlBuilder/URLComponents.java @@ -20,7 +20,7 @@ import org.json.JSONObject; import org.prebid.mobile.rendering.networking.parameters.AdRequestInput; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -60,7 +60,7 @@ public String getQueryArgString() { } } catch (JSONException e) { - OXLog.error(TAG, "Failed to add OpenRTB query arg"); + LogUtil.error(TAG, "Failed to add OpenRTB query arg"); } StringBuilder queryArgString = new StringBuilder(); @@ -71,7 +71,7 @@ public String getQueryArgString() { value = URLEncoder.encode(value, "UTF-8"); } catch (UnsupportedEncodingException e) { - OXLog.error(TAG, "Failed to encode value: " + value + " from key: " + key); + LogUtil.error(TAG, "Failed to encode value: " + value + " from key: " + key); continue; } //URL encoder turns spaces to +. SDK to convert + to %20 diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/parser/AdResponseParserVast.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/parser/AdResponseParserVast.java index 5661a1f0a..d48fdcc9a 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/parser/AdResponseParserVast.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/parser/AdResponseParserVast.java @@ -19,14 +19,10 @@ import android.text.TextUtils; import android.util.Xml; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.errors.VastParseError; import org.prebid.mobile.rendering.networking.parameters.BasicParameterBuilder; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.VideoAdEvent; import org.prebid.mobile.rendering.video.vast.Ad; import org.prebid.mobile.rendering.video.vast.AdVerifications; @@ -47,6 +43,10 @@ import java.util.Iterator; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + public class AdResponseParserVast extends AdResponseParserBase { private static final String TAG = AdResponseParserVast.class.getSimpleName(); @@ -382,9 +382,9 @@ public ArrayList getTrackingByType(VideoAdEvent.Event event) { while (iterator.hasNext()) { org.prebid.mobile.rendering.video.vast.Tracking t = iterator.next(); // Uncomment for debugging only; Else, too many log entries - // OXLog.debug(TAG, "iterating: " + t.event); + // PbLog.debug(TAG, "iterating: " + t.event); if (t.getEvent().equals(Tracking.EVENT_MAPPING[event.ordinal()])) { - // OXLog.debug(TAG, "iterating match: " + t.event); + // PbLog.debug(TAG, "iterating match: " + t.event); urls.add(t.getValue()); } } @@ -585,7 +585,7 @@ public static Companion getCompanionAd(@NonNull } } catch (IllegalArgumentException e) { - OXLog.error(TAG, e.getMessage()); + LogUtil.error(TAG, e.getMessage()); } } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/ManagersResolver.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/ManagersResolver.java index 384583086..4fb3e0314 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/ManagersResolver.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/ManagersResolver.java @@ -27,7 +27,7 @@ import org.prebid.mobile.rendering.sdk.deviceData.managers.NetworkConnectionInfoManager; import org.prebid.mobile.rendering.sdk.deviceData.managers.UserConsentManager; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.lang.ref.WeakReference; import java.util.Hashtable; @@ -185,7 +185,7 @@ public void prepare(Context context) { } } catch (Exception e) { - OXLog.error(TAG, "Failed to register managers: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to register managers: " + Log.getStackTraceString(e)); } finally { PrebidRenderingSettings.increaseTaskCount(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/PrebidRenderingSettings.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/PrebidRenderingSettings.java index 9aca055a0..efc0aab27 100755 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/PrebidRenderingSettings.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/PrebidRenderingSettings.java @@ -27,7 +27,7 @@ import org.prebid.mobile.rendering.sdk.deviceData.listeners.SdkInitListener; import org.prebid.mobile.rendering.session.manager.OmAdSessionManager; import org.prebid.mobile.rendering.utils.helpers.AppInfoManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.util.concurrent.atomic.AtomicInteger; @@ -157,7 +157,7 @@ public static void setTimeoutMillis(int millis) { public static void setBidServerHost(Host host) { if (host == null) { - OXLog.error(TAG, "setBidServerHost: Error. Can't assign a null host."); + LogUtil.error(TAG, "setBidServerHost: Error. Can't assign a null host."); return; } @@ -198,14 +198,14 @@ private static void initOpenMeasurementSDK(Context context) { } private static void initializeLogging() { - OXLog.setLogLevel(logLevel.getValue());//set to the publisher set value + LogUtil.setLogLevel(logLevel.getValue());//set to the publisher set value increaseTaskCount(); } static void increaseTaskCount() { if (INIT_SDK_TASK_COUNT.incrementAndGet() >= MANDATORY_TASK_COUNT) { sIsSdkInitialized = true; - OXLog.debug(TAG, "Prebid Rendering SDK " + SDK_VERSION + " Initialized"); + LogUtil.debug(TAG, "Prebid Rendering SDK " + SDK_VERSION + " Initialized"); if (sInitSdkListener != null) { sInitSdkListener.onSDKInit(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/calendar/CalendarEventWrapper.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/calendar/CalendarEventWrapper.java index 468baed00..3c155de2b 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/calendar/CalendarEventWrapper.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/calendar/CalendarEventWrapper.java @@ -17,7 +17,7 @@ package org.prebid.mobile.rendering.sdk.calendar; import org.json.JSONObject; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.text.ParseException; @@ -109,7 +109,7 @@ public void setStart(String start) } catch (ParseException e) { - OXLog.error(TAG, "Failed to parse start date:" + e.getMessage()); + LogUtil.error(TAG, "Failed to parse start date:" + e.getMessage()); } } @@ -126,7 +126,7 @@ public void setEnd(String end) } catch (ParseException e) { - OXLog.error(TAG, "Failed to parse end date:" + e.getMessage()); + LogUtil.error(TAG, "Failed to parse end date:" + e.getMessage()); } } @@ -173,7 +173,7 @@ public void setReminder(String reminder) } catch (ParseException e) { - OXLog.error(TAG, "Failed to parse reminder date:" + e.getMessage()); + LogUtil.error(TAG, "Failed to parse reminder date:" + e.getMessage()); } } @@ -209,7 +209,7 @@ private void setCalendarRecurrence(String recurrence) } catch (Exception e) { - OXLog.error(TAG, "Failed to set calendar recurrence:" + e.getMessage()); + LogUtil.error(TAG, "Failed to set calendar recurrence:" + e.getMessage()); } } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/calendar/CalendarRepeatRule.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/calendar/CalendarRepeatRule.java index 4904f882d..de120d758 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/calendar/CalendarRepeatRule.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/calendar/CalendarRepeatRule.java @@ -18,7 +18,7 @@ import org.json.JSONArray; import org.json.JSONObject; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.text.ParseException; @@ -71,7 +71,7 @@ public void setExpires(String expires) { mExpires = new DateWrapper(expires); } catch (ParseException e) { - OXLog.error(TAG, "Failed to parse expires date:" + e.getMessage()); + LogUtil.error(TAG, "Failed to parse expires date:" + e.getMessage()); } } @@ -91,7 +91,7 @@ public void setExceptionDates(String[] exceptionDates) { // Date can't be parsed mExceptionDates[ind] = null; - OXLog.error(TAG, "Failed to parse exception date:" + e.getMessage()); + LogUtil.error(TAG, "Failed to parse exception date:" + e.getMessage()); } ++ind; } @@ -184,7 +184,7 @@ private void setMonthsInYear(JSONArray monthsInYear) { setMonthsInYear(months); } catch (Exception e) { - OXLog.error(TAG, "Failed to set months in year:" + e.getMessage()); + LogUtil.error(TAG, "Failed to set months in year:" + e.getMessage()); } } } @@ -203,7 +203,7 @@ private void setWeeksInMonth(JSONArray weeksInMonth) { setWeeksInMonth(weeks); } catch (Exception e) { - OXLog.error(TAG, "Failed to set weeks in month:" + e.getMessage()); + LogUtil.error(TAG, "Failed to set weeks in month:" + e.getMessage()); } } } @@ -222,7 +222,7 @@ private void setDaysInYear(JSONArray daysInYear) { setDaysInYear(days); } catch (Exception e) { - OXLog.error(TAG, "Failed to set days in year:" + e.getMessage()); + LogUtil.error(TAG, "Failed to set days in year:" + e.getMessage()); } } } @@ -241,7 +241,7 @@ private void setDaysInMonth(JSONArray daysInMonth) { setDaysInMonth(days); } catch (Exception e) { - OXLog.error(TAG, "Failed to set days in month:" + e.getMessage()); + LogUtil.error(TAG, "Failed to set days in month:" + e.getMessage()); } } } @@ -260,7 +260,7 @@ private void setDaysInWeek(JSONArray daysInWeek) { setDaysInWeek(days); } catch (Exception e) { - OXLog.error(TAG, "Failed to set days in week:" + e.getMessage()); + LogUtil.error(TAG, "Failed to set days in week:" + e.getMessage()); } } } @@ -277,7 +277,7 @@ private void setExceptionDates(JSONArray exceptionDates) { setExceptionDates(dates); } catch (Exception e) { - OXLog.error(TAG, "Failed to set exception days:" + e.getMessage()); + LogUtil.error(TAG, "Failed to set exception days:" + e.getMessage()); } } } @@ -288,7 +288,7 @@ private void setInterval(String interval) { setInterval(Integer.parseInt(interval)); } catch (Exception e) { - OXLog.error(TAG, "Failed to set interval:" + e.getMessage()); + LogUtil.error(TAG, "Failed to set interval:" + e.getMessage()); } } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/ConnectionInfoManager.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/ConnectionInfoManager.java index 67fcb07e2..1e7b5541f 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/ConnectionInfoManager.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/ConnectionInfoManager.java @@ -31,5 +31,5 @@ public interface ConnectionInfoManager { * * @return the active connection type */ - UserParameters.OXMConnectionType getConnectionType(); + UserParameters.ConnectionType getConnectionType(); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/DeviceInfoImpl.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/DeviceInfoImpl.java index 9f909180d..15624721e 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/DeviceInfoImpl.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/DeviceInfoImpl.java @@ -32,14 +32,12 @@ import android.text.TextUtils; import android.view.WindowManager; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.sdk.BaseManager; import org.prebid.mobile.rendering.sdk.calendar.CalendarEventWrapper; import org.prebid.mobile.rendering.sdk.calendar.CalendarFactory; import org.prebid.mobile.rendering.utils.helpers.ExternalViewerUtils; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.browser.AdBrowserActivity; import java.io.BufferedInputStream; @@ -53,6 +51,8 @@ import java.net.URL; import java.net.URLConnection; +import androidx.annotation.VisibleForTesting; + import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE; @@ -209,7 +209,7 @@ public boolean isScreenLocked() { @Override public boolean isActivityOrientationLocked(Context context) { if (!(context instanceof Activity)) { - OXLog.debug(TAG, "isScreenOrientationLocked() executed with non-activity context. Returning false."); + LogUtil.debug(TAG, "isScreenOrientationLocked() executed with non-activity context. Returning false."); return false; } @@ -236,7 +236,7 @@ public void createCalendarEvent(final CalendarEventWrapper event) { @Override public void storePicture(String url) throws Exception { if (!Utils.isExternalStorageAvailable()) { - OXLog.error(TAG, "storePicture: Failed. External storage is not available"); + LogUtil.error(TAG, "storePicture: Failed. External storage is not available"); return; } String fileName = Utils.md5(url); @@ -249,7 +249,7 @@ public void storePicture(String url) throws Exception { OutputStream outputStream = getOutputStream(fileName); if (outputStream == null) { - OXLog.error(TAG, "Could not get Outputstream to write file to"); + LogUtil.error(TAG, "Could not get Outputstream to write file to"); return; } @@ -320,7 +320,7 @@ OutputStream getOutputStreamPreQ(String fileName) throws FileNotFoundException { OutputStream getOutPutStreamForQ(String filename, Context context) throws FileNotFoundException { if (context == null) { - OXLog.debug(TAG, "getOutPutStreamForQ: Failed. Context is null"); + LogUtil.debug(TAG, "getOutPutStreamForQ: Failed. Context is null"); return null; } @@ -331,7 +331,7 @@ OutputStream getOutPutStreamForQ(String filename, Context context) Uri contentUri = MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL); Uri insert = contentResolver.insert(contentUri, contentValues); if (insert == null) { - OXLog.debug(TAG, "Could not save content uri"); + LogUtil.debug(TAG, "Could not save content uri"); return null; } return contentResolver.openOutputStream(insert); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/NetworkConnectionInfoManager.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/NetworkConnectionInfoManager.java index ba3c77107..3df73db26 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/NetworkConnectionInfoManager.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/sdk/deviceData/managers/NetworkConnectionInfoManager.java @@ -45,9 +45,9 @@ public void init(Context context) { */ @SuppressLint("MissingPermission") @Override - public UserParameters.OXMConnectionType getConnectionType() { + public UserParameters.ConnectionType getConnectionType() { NetworkInfo info = null; - UserParameters.OXMConnectionType result = UserParameters.OXMConnectionType.OFFLINE; + UserParameters.ConnectionType result = UserParameters.ConnectionType.OFFLINE; if (isInit() && getContext() != null) { if (mConnectivityManager != null) { if (getContext().checkCallingOrSelfPermission(Manifest.permission.ACCESS_NETWORK_STATE) == PackageManager.PERMISSION_GRANTED) { @@ -59,8 +59,8 @@ public UserParameters.OXMConnectionType getConnectionType() { if (info.isConnected()) { boolean isMobile = netType == ConnectivityManager.TYPE_MOBILE || netType == ConnectivityManager.TYPE_MOBILE_DUN || netType == ConnectivityManager.TYPE_MOBILE_HIPRI || netType == ConnectivityManager.TYPE_MOBILE_MMS || netType == ConnectivityManager.TYPE_MOBILE_SUPL; result = isMobile - ? UserParameters.OXMConnectionType.CELL - : UserParameters.OXMConnectionType.WIFI; + ? UserParameters.ConnectionType.CELL + : UserParameters.ConnectionType.WIFI; } } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/session/manager/OmAdSessionManager.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/session/manager/OmAdSessionManager.java index 9f83e2947..9e5e471ca 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/session/manager/OmAdSessionManager.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/session/manager/OmAdSessionManager.java @@ -21,8 +21,6 @@ import android.view.View; import android.webkit.WebView; -import androidx.annotation.Nullable; - import com.iab.omid.library.prebidorg.Omid; import com.iab.omid.library.prebidorg.ScriptInjector; import com.iab.omid.library.prebidorg.adsession.AdEvents; @@ -44,7 +42,7 @@ import org.prebid.mobile.rendering.models.internal.InternalFriendlyObstruction; import org.prebid.mobile.rendering.models.internal.InternalPlayerState; import org.prebid.mobile.rendering.sdk.JSLibraryManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.VideoAdEvent; import org.prebid.mobile.rendering.video.vast.AdVerifications; import org.prebid.mobile.rendering.video.vast.Verification; @@ -54,6 +52,8 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.Nullable; + /** * OmAdSessionManager is an implementation of Open Measurement used to track * web and native video ad events. @@ -86,7 +86,7 @@ public static boolean activateOmSdk(Context applicationContext) { return Omid.isActive(); } catch (Throwable e) { - OXLog.error(TAG, "Did you add omsdk-android.aar? Failed to init openMeasurementSDK: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Did you add omsdk-android.aar? Failed to init openMeasurementSDK: " + Log.getStackTraceString(e)); } return false; } @@ -97,7 +97,7 @@ public static boolean activateOmSdk(Context applicationContext) { @Nullable public static OmAdSessionManager createNewInstance(JSLibraryManager jsLibraryManager) { if (!isActive()) { - OXLog.error(TAG, "Failed to initialize OmAdSessionManager. Did you activate OMSDK?"); + LogUtil.error(TAG, "Failed to initialize OmAdSessionManager. Did you activate OMSDK?"); return null; } @@ -159,7 +159,7 @@ public void initNativeDisplayAdSession(View view, */ public void displayAdLoaded() { if (mAdEvents == null) { - OXLog.error(TAG, "Failed to register displayAdLoaded. AdEvent is null"); + LogUtil.error(TAG, "Failed to register displayAdLoaded. AdEvent is null"); return; } mAdEvents.loaded(); @@ -172,7 +172,7 @@ public void displayAdLoaded() { */ public void nonSkippableStandaloneVideoAdLoaded(final boolean isAutoPlay) { if (mAdEvents == null) { - OXLog.error(TAG, "Failed to register videoAdLoaded. adEvent is null"); + LogUtil.error(TAG, "Failed to register videoAdLoaded. adEvent is null"); return; } try { @@ -181,7 +181,7 @@ public void nonSkippableStandaloneVideoAdLoaded(final boolean isAutoPlay) { mAdEvents.loaded(vastProperties); } catch (Exception e) { - OXLog.error(TAG, "Failed to register videoAdLoaded. Reason: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to register videoAdLoaded. Reason: " + Log.getStackTraceString(e)); } } @@ -193,7 +193,7 @@ public void nonSkippableStandaloneVideoAdLoaded(final boolean isAutoPlay) { */ public void videoAdStarted(final float duration, final float videoPlayerVolume) { if (mMediaEvents == null) { - OXLog.error(TAG, "Failed to register videoAdStarted. videoAdEvent is null"); + LogUtil.error(TAG, "Failed to register videoAdStarted. videoAdEvent is null"); return; } mMediaEvents.start(duration, videoPlayerVolume); @@ -204,14 +204,14 @@ public void videoAdStarted(final float duration, final float videoPlayerVolume) */ public void registerImpression() { if (mAdEvents == null) { - OXLog.error(TAG, "Failed to registerImpression: AdEvent is null"); + LogUtil.error(TAG, "Failed to registerImpression: AdEvent is null"); return; } try { mAdEvents.impressionOccurred(); } catch (IllegalArgumentException | IllegalStateException e) { - OXLog.error(TAG, "Failed to registerImpression: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to registerImpression: " + Log.getStackTraceString(e)); } } @@ -222,7 +222,7 @@ public void registerImpression() { */ public void trackVolumeChange(float volume) { if (mMediaEvents == null) { - OXLog.error(TAG, "Failed to trackVolumeChange. videoAdEvent is null"); + LogUtil.error(TAG, "Failed to trackVolumeChange. videoAdEvent is null"); return; } mMediaEvents.volumeChange(volume); @@ -253,7 +253,7 @@ public void trackVolumeChange(float volume) { */ public void trackAdVideoEvent(VideoAdEvent.Event adEvent) { if (mMediaEvents == null) { - OXLog.error(TAG, "Failed to trackAdVideoEvent. videoAdEvent is null"); + LogUtil.error(TAG, "Failed to trackAdVideoEvent. videoAdEvent is null"); return; } switch (adEvent) { @@ -321,7 +321,7 @@ public void trackDisplayAdEvent(TrackingEvent.Events adEvent) { */ public void trackPlayerStateChangeEvent(InternalPlayerState playerState) { if (mMediaEvents == null) { - OXLog.error(TAG, "Failed to track PlayerStateChangeEvent. videoAdEvent is null"); + LogUtil.error(TAG, "Failed to track PlayerStateChangeEvent. videoAdEvent is null"); return; } mMediaEvents.playerStateChange(OmModelMapper.mapToPlayerState(playerState)); @@ -332,7 +332,7 @@ public void trackPlayerStateChangeEvent(InternalPlayerState playerState) { */ public void startAdSession() { if (mAdSession == null) { - OXLog.error(TAG, "Failed to startAdSession. adSession is null"); + LogUtil.error(TAG, "Failed to startAdSession. adSession is null"); return; } mAdSession.start(); @@ -343,7 +343,7 @@ public void startAdSession() { */ public void stopAdSession() { if (mAdSession == null) { - OXLog.error(TAG, "Failed to stopAdSession. adSession is null"); + LogUtil.error(TAG, "Failed to stopAdSession. adSession is null"); return; } mAdSession.finish(); @@ -358,14 +358,14 @@ public void stopAdSession() { */ public void registerAdView(View adView) { if (mAdSession == null) { - OXLog.error(TAG, "Failed to registerAdView. adSession is null"); + LogUtil.error(TAG, "Failed to registerAdView. adSession is null"); return; } try { mAdSession.registerAdView(adView); } catch (IllegalArgumentException e) { - OXLog.error(TAG, "Failed to registerAdView. " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to registerAdView. " + Log.getStackTraceString(e)); } } @@ -375,7 +375,7 @@ public void registerAdView(View adView) { */ public void addObstruction(InternalFriendlyObstruction friendlyObstruction) { if (mAdSession == null) { - OXLog.error(TAG, "Failed to addObstruction: mAdSession is null"); + LogUtil.error(TAG, "Failed to addObstruction: mAdSession is null"); return; } try { @@ -386,13 +386,13 @@ public void addObstruction(InternalFriendlyObstruction friendlyObstruction) { friendlyObstruction.getDetailedDescription()); } catch (IllegalArgumentException e) { - OXLog.error(TAG, "Failed to addObstruction. Reason: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to addObstruction. Reason: " + Log.getStackTraceString(e)); } } private void trackAdUserInteractionEvent(InteractionType type) { if (mMediaEvents == null) { - OXLog.error(TAG, "Failed to register adUserInteractionEvent with type: " + type); + LogUtil.error(TAG, "Failed to register adUserInteractionEvent with type: " + type); return; } @@ -410,7 +410,7 @@ private AdSessionConfiguration createAdSessionConfiguration(CreativeType creativ false); } catch (IllegalArgumentException e) { - OXLog.error(TAG, "Failure createAdSessionConfiguration: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failure createAdSessionConfiguration: " + Log.getStackTraceString(e)); return null; } } @@ -420,7 +420,7 @@ private static boolean isActive() { return Omid.isActive(); } catch (Throwable ignore) { - OXLog.error(TAG, "Failed to check OpenMeasurement status. Did you include omsdk-android? " + Log.getStackTraceString(ignore)); + LogUtil.error(TAG, "Failed to check OpenMeasurement status. Did you include omsdk-android? " + Log.getStackTraceString(ignore)); } return false; } @@ -433,7 +433,7 @@ private void initPartner() { mPartner = Partner.createPartner(PARTNER_NAME, PARTNER_VERSION); } catch (IllegalArgumentException e) { - OXLog.error(TAG, "Failed to initPartner. Reason: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to initPartner. Reason: " + Log.getStackTraceString(e)); } } @@ -445,12 +445,12 @@ private void initPartner() { */ private void initAdSession(AdSessionConfiguration adSessionConfiguration, AdSessionContext adSessionContext) { if (mAdSession != null) { - OXLog.debug(TAG, "initAdSession: adSession is already created"); + LogUtil.debug(TAG, "initAdSession: adSession is already created"); return; } if (adSessionConfiguration == null || adSessionContext == null) { - OXLog.error(TAG, "Failure initAdSession. adSessionConfiguration OR adSessionContext is null"); + LogUtil.error(TAG, "Failure initAdSession. adSessionConfiguration OR adSessionContext is null"); return; } @@ -465,7 +465,7 @@ private void initMediaAdEvents() { mMediaEvents = MediaEvents.createMediaEvents(mAdSession); } catch (IllegalArgumentException e) { - OXLog.error(TAG, "Failure initMediaAdEvents: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failure initMediaAdEvents: " + Log.getStackTraceString(e)); } } @@ -477,7 +477,7 @@ private void initAdEvents() { mAdEvents = AdEvents.createAdEvents(mAdSession); } catch (IllegalArgumentException e) { - OXLog.error(TAG, "Failure initAdEvents: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failure initAdEvents: " + Log.getStackTraceString(e)); } } @@ -488,7 +488,7 @@ private AdSessionContext createAdSessionContext(WebView adView, String contentUr return AdSessionContext.createHtmlAdSessionContext(mPartner, adView, contentUrl, customReferenceData); } catch (IllegalArgumentException e) { - OXLog.error(TAG, "Failure createAdSessionContext: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failure createAdSessionContext: " + Log.getStackTraceString(e)); return null; } } @@ -503,7 +503,7 @@ private AdSessionContext createAdSessionContext(List null); } catch (IllegalArgumentException e) { - OXLog.error(TAG, "Failure createAdSessionContext: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failure createAdSessionContext: " + Log.getStackTraceString(e)); return null; } } @@ -511,13 +511,13 @@ private AdSessionContext createAdSessionContext(List @Nullable private AdSessionContext createAdSessionContext(AdVerifications adVerifications, String contentUrl) { if (adVerifications == null) { - OXLog.error(TAG, "Unable to createAdSessionContext. AdVerification is null"); + LogUtil.error(TAG, "Unable to createAdSessionContext. AdVerification is null"); return null; } // Log all jsResources being used for (Verification verification : adVerifications.getVerifications()) { - OXLog.debug(TAG, "Using jsResource: " + verification.getJsResource()); + LogUtil.debug(TAG, "Using jsResource: " + verification.getJsResource()); } try { @@ -525,11 +525,11 @@ private AdSessionContext createAdSessionContext(AdVerifications adVerifications, return createAdSessionContext(verificationScriptResources, contentUrl); } catch (IllegalArgumentException e) { - OXLog.error(TAG, "Failure createAdSessionContext: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failure createAdSessionContext: " + Log.getStackTraceString(e)); return null; } catch (MalformedURLException e) { - OXLog.error(TAG, "Failure createAdSessionContext: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failure createAdSessionContext: " + Log.getStackTraceString(e)); return null; } } @@ -561,7 +561,7 @@ private List createVerificationScriptResources(Nativ if (nativeOmVerification.getOmidJsUrl() == null || nativeOmVerification.getVendorKey() == null || nativeOmVerification.getVerificationParameters() == null) { - OXLog.error(TAG, "Failed to create VerificationResource. $nativeOmVerification"); + LogUtil.error(TAG, "Failed to create VerificationResource. $nativeOmVerification"); return verificationScriptResources; } @@ -572,7 +572,7 @@ private List createVerificationScriptResources(Nativ verificationScriptResources.add(scriptResource); } catch (MalformedURLException e) { - OXLog.error(TAG, "Failed to generate VerificationResources: " + e.getMessage()); + LogUtil.error(TAG, "Failed to generate VerificationResources: " + e.getMessage()); } return verificationScriptResources; diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/MraidOrientationBroadcastReceiver.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/MraidOrientationBroadcastReceiver.java index fff66bc52..e3af97447 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/MraidOrientationBroadcastReceiver.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/MraidOrientationBroadcastReceiver.java @@ -18,7 +18,7 @@ import android.os.Build; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.mraid.BaseJSInterface; import org.prebid.mobile.rendering.views.webview.mraid.JSInterface; @@ -41,12 +41,12 @@ public void handleOrientationChange(int currentRotation) { super.handleOrientationChange(currentRotation); BaseJSInterface baseJSInterface = mBaseJSInterfaceWeakReference.get(); if (baseJSInterface == null) { - OXLog.debug(TAG, "handleOrientationChange failure. BaseJsInterface is null"); + LogUtil.debug(TAG, "handleOrientationChange failure. BaseJsInterface is null"); return; } if (shouldHandleClose()) { - OXLog.debug(TAG, "Call 'close' action for MRAID Resize after changing rotation for API 19."); + LogUtil.debug(TAG, "Call 'close' action for MRAID Resize after changing rotation for API 19."); baseJSInterface.close(); } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/OrientationBroadcastReceiver.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/OrientationBroadcastReceiver.java index 2834751b7..47c545964 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/OrientationBroadcastReceiver.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/OrientationBroadcastReceiver.java @@ -22,7 +22,7 @@ import android.content.IntentFilter; import android.view.WindowManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; public class OrientationBroadcastReceiver extends BroadcastReceiver { @@ -36,7 +36,7 @@ public class OrientationBroadcastReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - OXLog.debug(TAG, "onReceive"); + LogUtil.debug(TAG, "onReceive"); if (Intent.ACTION_CONFIGURATION_CHANGED.equals(intent.getAction())) { int orientation = getDisplayRotation(); if (orientation != mLastRotation) { @@ -50,17 +50,17 @@ public void onReceive(Context context, Intent intent) { } public boolean isOrientationChanged() { - OXLog.debug(TAG, "isOrientationChanged: " + orientationChanged); + LogUtil.debug(TAG, "isOrientationChanged: " + orientationChanged); return orientationChanged; } public void setOrientationChanged(boolean orientationChanged) { - OXLog.debug(TAG, "setOrientationChanged: " + orientationChanged); + LogUtil.debug(TAG, "setOrientationChanged: " + orientationChanged); this.orientationChanged = orientationChanged; } public void handleOrientationChange(int currentRotation){ - OXLog.debug(TAG, "handleOrientationChange currentRotation = " + currentRotation); + LogUtil.debug(TAG, "handleOrientationChange currentRotation = " + currentRotation); } private int getDisplayRotation() { @@ -70,7 +70,7 @@ private int getDisplayRotation() { public void register(final Context context) { if (context != null) { - OXLog.debug(TAG, "register"); + LogUtil.debug(TAG, "register"); mApplicationContext = context.getApplicationContext(); if (mApplicationContext != null) { mApplicationContext.registerReceiver(this, @@ -81,7 +81,7 @@ public void register(final Context context) { public void unregister() { if (mApplicationContext != null) { - OXLog.debug(TAG, "unregister"); + LogUtil.debug(TAG, "unregister"); mApplicationContext.unregisterReceiver(this); mApplicationContext = null; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/ScreenStateReceiver.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/ScreenStateReceiver.java index b05876959..171e23eba 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/ScreenStateReceiver.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/broadcast/ScreenStateReceiver.java @@ -21,7 +21,7 @@ import android.content.Intent; import android.content.IntentFilter; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; public class ScreenStateReceiver extends BroadcastReceiver { private static final String TAG = ScreenStateReceiver.class.getSimpleName(); @@ -52,7 +52,7 @@ public boolean isScreenOn() { public void register(final Context context) { if (context == null) { - OXLog.debug(TAG, "register: Failed. Context is null"); + LogUtil.debug(TAG, "register: Failed. Context is null"); return; } @@ -65,7 +65,7 @@ public void register(final Context context) { public void unregister() { if (mApplicationContext == null) { - OXLog.debug(TAG, "unregister: Failed. Context is null"); + LogUtil.debug(TAG, "unregister: Failed. Context is null"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/exposure/ViewExposureChecker.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/exposure/ViewExposureChecker.java index b8e7c1541..85410c339 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/exposure/ViewExposureChecker.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/exposure/ViewExposureChecker.java @@ -24,7 +24,7 @@ import android.widget.ImageView; import org.prebid.mobile.rendering.R; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -48,7 +48,7 @@ public ViewExposureChecker() { public ViewExposure exposure(View view) { if (view == null) { - OXLog.debug(TAG, "exposure: Returning zeroExposure. Test View is null."); + LogUtil.debug(TAG, "exposure: Returning zeroExposure. Test View is null."); return null; } @@ -64,7 +64,7 @@ public ViewExposure exposure(View view) { boolean visitParent = visitParent(((ViewGroup) view.getParent()), view); boolean collapseBoundingBox = collapseBoundingBox(); - OXLog.debug(TAG, "exposure: visitParent " + visitParent + " collapseBox " + collapseBoundingBox); + LogUtil.debug(TAG, "exposure: visitParent " + visitParent + " collapseBox " + collapseBoundingBox); boolean potentiallyExposed = visitParent && collapseBoundingBox; if (!potentiallyExposed) { return zeroExposure; @@ -267,7 +267,7 @@ private void fragmentize(Rect valueRect, Rect aroundRect, List destList) { boolean isRectTrimmed = trimmedRect.intersect(valueRect); if (!isRectTrimmed) { - OXLog.debug(TAG, "fragmentize: Error. Rect is not trimmed"); + LogUtil.debug(TAG, "fragmentize: Error. Rect is not trimmed"); return; } @@ -313,7 +313,7 @@ private boolean isClippedToBounds(ViewGroup viewGroup) { private Rect convertRect(Rect fromRect, View fromView, View toView) { if (fromRect == null || fromView == null || toView == null) { - OXLog.debug(TAG, "convertRect: Failed. One of the provided param is null. Returning empty rect."); + LogUtil.debug(TAG, "convertRect: Failed. One of the provided param is null. Returning empty rect."); return new Rect(); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/AdIdManager.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/AdIdManager.java index 1a5a5d708..4a3c48c76 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/AdIdManager.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/AdIdManager.java @@ -21,17 +21,17 @@ import android.os.Handler; import android.util.Log; -import androidx.annotation.VisibleForTesting; - import com.google.android.gms.ads.identifier.AdvertisingIdClient; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; import org.prebid.mobile.rendering.listeners.AdIdFetchListener; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.lang.ref.WeakReference; +import androidx.annotation.VisibleForTesting; + public class AdIdManager { private static final String TAG = AdIdManager.class.getSimpleName(); @@ -61,7 +61,7 @@ public static void initAdId(final Context context, final AdIdFetchListener liste Handler handler = new Handler(); handler.postDelayed(() -> { if (getAdIdInfoTask.getStatus() == AsyncTask.Status.RUNNING) { - OXLog.debug(TAG, "Cancelling FetchAdIdInfoTask"); + LogUtil.debug(TAG, "Cancelling FetchAdIdInfoTask"); getAdIdInfoTask.cancel(true); listener.adIdFetchFailure(); } @@ -72,7 +72,7 @@ public static void initAdId(final Context context, final AdIdFetchListener liste } } catch (Throwable throwable) { - OXLog.error(TAG, "Failed to initAdId: " + Log.getStackTraceString(throwable) + "\nDid you add necessary dependencies?"); + LogUtil.error(TAG, "Failed to initAdId: " + Log.getStackTraceString(throwable) + "\nDid you add necessary dependencies?"); } } @@ -126,7 +126,7 @@ protected Void doInBackground(Void... voids) { sLimitAdTrackingEnabled = adInfo.isLimitAdTrackingEnabled(); } catch (Throwable e) { - OXLog.error(TAG, "Failed to get advertising id and LMT: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to get advertising id and LMT: " + Log.getStackTraceString(e)); } return null; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/AppInfoManager.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/AppInfoManager.java index 9815ca9de..dd4822dbd 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/AppInfoManager.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/AppInfoManager.java @@ -26,11 +26,11 @@ import android.util.Log; import android.webkit.WebView; -import androidx.annotation.VisibleForTesting; - import com.google.android.gms.security.ProviderInstaller; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; + +import androidx.annotation.VisibleForTesting; public class AppInfoManager { private static final String TAG = AppInfoManager.class.getSimpleName(); @@ -90,11 +90,11 @@ private static void initPackageInfo(Context context) { sAppVersion = pm.getPackageInfo(sPackageName, 0).versionName; } catch (Exception e) { - OXLog.error(TAG, "Failed to get app name: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to get app name: " + Log.getStackTraceString(e)); } } catch (Exception e) { - OXLog.error(TAG, "Failed to get package name: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to get package name: " + Log.getStackTraceString(e)); } } } @@ -111,7 +111,7 @@ private static void initUserAgent(Context context) { } } catch (Exception e) { - OXLog.error(TAG, "Failed to get user agent"); + LogUtil.error(TAG, "Failed to get user agent"); } } @@ -128,17 +128,17 @@ private static void patchSecurityProviderIfNeeded(Context context) { ProviderInstaller.installIfNeededAsync(context, new ProviderInstaller.ProviderInstallListener() { @Override public void onProviderInstalled() { - OXLog.debug(TAG, "Provider installed successfully"); + LogUtil.debug(TAG, "Provider installed successfully"); } @Override public void onProviderInstallFailed(int i, Intent intent) { - OXLog.debug(TAG, "Provider installed failed. Error code: " + i); + LogUtil.debug(TAG, "Provider installed failed. Error code: " + i); } }); } catch (Throwable throwable) { - OXLog.error(TAG, "patchSecurityProvider Failed! Reason: " + Log.getStackTraceString(throwable)); + LogUtil.error(TAG, "patchSecurityProvider Failed! Reason: " + Log.getStackTraceString(throwable)); } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/ExternalViewerUtils.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/ExternalViewerUtils.java index 936f6e096..13cec0fae 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/ExternalViewerUtils.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/ExternalViewerUtils.java @@ -25,19 +25,19 @@ import android.net.Uri; import android.webkit.URLUtil; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.listeners.OnBrowserActionResultListener; import org.prebid.mobile.rendering.listeners.OnBrowserActionResultListener.BrowserActionResult; import org.prebid.mobile.rendering.sdk.PrebidRenderingSettings; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.utils.url.ActionNotResolvedException; import org.prebid.mobile.rendering.views.browser.AdBrowserActivity; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; public class ExternalViewerUtils { @@ -46,7 +46,7 @@ public class ExternalViewerUtils { public static boolean isBrowserActivityCallable(Context context) { if (context == null) { - OXLog.debug(TAG, "isBrowserActivityCallable(): returning false. Context is null"); + LogUtil.debug(TAG, "isBrowserActivityCallable(): returning false. Context is null"); return false; } @@ -59,7 +59,7 @@ public static boolean isBrowserActivityCallable(Context context) { */ public static boolean isActivityCallable(Context context, Intent intent) { if (context == null || intent == null) { - OXLog.debug(TAG, "isActivityCallable(): returning false. Intent or context is null"); + LogUtil.debug(TAG, "isActivityCallable(): returning false. Intent or context is null"); return false; } @@ -118,7 +118,7 @@ public static void startBrowser(Context context, String url, int broadcastId, private static void startExternalBrowser(Context context, String url) { if (context == null || url == null) { - OXLog.error(TAG, "startExternalBrowser: Failure. Context or URL is null"); + LogUtil.error(TAG, "startExternalBrowser: Failure. Context or URL is null"); return; } Intent intent = new Intent(Intent.ACTION_VIEW); @@ -127,7 +127,7 @@ private static void startExternalBrowser(Context context, String url) { context.startActivity(intent); } else { - OXLog.error(TAG, "No activity available to handle action " + intent.toString()); + LogUtil.error(TAG, "No activity available to handle action " + intent.toString()); } } @@ -155,7 +155,7 @@ private static void notifyBrowserActionSuccess(BrowserActionResult browserAction OnBrowserActionResultListener onBrowserActionResultListener) { if (onBrowserActionResultListener == null) { - OXLog.debug(TAG, "notifyBrowserActionSuccess(): Failed. BrowserActionResultListener is null."); + LogUtil.debug(TAG, "notifyBrowserActionSuccess(): Failed. BrowserActionResultListener is null."); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/MacrosResolutionHelper.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/MacrosResolutionHelper.java index 5d664d884..a01da98cf 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/MacrosResolutionHelper.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/MacrosResolutionHelper.java @@ -18,7 +18,7 @@ import org.json.JSONObject; import org.prebid.mobile.rendering.models.internal.MacrosModel; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.util.Map; @@ -37,7 +37,7 @@ private MacrosResolutionHelper() { public static String resolveTargetingMarcos(String creative, Map targetingMap) { if (targetingMap == null) { - OXLog.error(TAG, "resolveMacros: Failed. Targeting map is null."); + LogUtil.error(TAG, "resolveMacros: Failed. Targeting map is null."); return creative; } @@ -56,7 +56,7 @@ public static String resolveTargetingMarcos(String creative, Map public static String resolveAuctionMacros(String target, Map replaceMacrosMap) { if (replaceMacrosMap == null || replaceMacrosMap.isEmpty()) { - OXLog.error(TAG, "resolveAuctionMacros: Failed. Macros map is null or empty."); + LogUtil.error(TAG, "resolveAuctionMacros: Failed. Macros map is null or empty."); return target; } @@ -72,12 +72,12 @@ public static String resolveAuctionMacros(String target, Map getQueryMap(String query) { public static View createCloseView(Context context) { if (context == null) { - OXLog.error(TAG, "Unable to create close view. Context is null"); + LogUtil.error(TAG, "Unable to create close view. Context is null"); return null; } @@ -457,7 +457,7 @@ public static View createCloseView(Context context) { public static View createWatchAgainView(Context context) { if (context == null) { - OXLog.error(TAG, "Unable to create watch again view. Context is null"); + LogUtil.error(TAG, "Unable to create watch again view. Context is null"); return null; } View watchAgainView = LayoutInflater.from(context).inflate(R.layout.lyt_watch_again, null); @@ -477,7 +477,7 @@ public static View createWatchAgainView(Context context) { public static boolean isPermissionGranted(final Context context, final String permission) { if (context == null || permission == null) { - OXLog.debug("Utils", "isPermissionGranted: Context or Permission is null"); + LogUtil.debug("Utils", "isPermissionGranted: Context or Permission is null"); return false; } // Bug in ContextCompat where it can return a RuntimeException in rare circumstances. @@ -507,7 +507,7 @@ public static long getMsFrom(String durationInString) { date = dateFormat.parse(durationInString); } catch (ParseException e) { - OXLog.error(TAG, "Unable to convert the videoDuration into seconds: " + e.getMessage()); + LogUtil.error(TAG, "Unable to convert the videoDuration into seconds: " + e.getMessage()); } if (date != null) { miliseconds = date.getTime(); @@ -563,8 +563,8 @@ public static int clampAutoRefresh(int refreshDelay) { final int clampedRefreshInterval = clampInMillis(userRefreshValue, AUTO_REFRESH_DELAY_MIN, AUTO_REFRESH_DELAY_MAX); if (userRefreshValue < AUTO_REFRESH_DELAY_MIN || userRefreshValue > AUTO_REFRESH_DELAY_MAX) { - OXLog.warn(TAG, "Refresh interval is out of range. Value which will be used for refresh: " + clampedRefreshInterval + ". " - + "Make sure that the refresh interval is in the following range: [" + AUTO_REFRESH_DELAY_MIN + ", " + AUTO_REFRESH_DELAY_MAX + "]"); + LogUtil.warn(TAG, "Refresh interval is out of range. Value which will be used for refresh: " + clampedRefreshInterval + ". " + + "Make sure that the refresh interval is in the following range: [" + AUTO_REFRESH_DELAY_MIN + ", " + AUTO_REFRESH_DELAY_MAX + "]"); } return clampedRefreshInterval; diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/VisibilityChecker.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/VisibilityChecker.java index cc754663e..64e9e6f39 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/VisibilityChecker.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/helpers/VisibilityChecker.java @@ -21,12 +21,12 @@ import android.view.View; import android.view.ViewParent; -import androidx.annotation.Nullable; - import org.prebid.mobile.rendering.models.internal.VisibilityTrackerOption; import org.prebid.mobile.rendering.utils.exposure.ViewExposure; import org.prebid.mobile.rendering.utils.exposure.ViewExposureChecker; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; + +import androidx.annotation.Nullable; import static org.prebid.mobile.rendering.models.ntv.NativeEventTracker.EventType.IMPRESSION; import static org.prebid.mobile.rendering.models.ntv.NativeEventTracker.EventType.OMID; @@ -135,7 +135,7 @@ public ViewExposure checkViewExposure( } ViewExposure exposure = mViewExposureChecker.exposure(view); - OXLog.debug(TAG, exposure != null ? exposure.toString() : "null exposure"); + LogUtil.debug(TAG, exposure != null ? exposure.toString() : "null exposure"); return exposure; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/logger/OXLog.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/logger/LogUtil.java similarity index 98% rename from PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/logger/OXLog.java rename to PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/logger/LogUtil.java index 2fdab0f0b..1b41d8ed1 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/logger/OXLog.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/logger/LogUtil.java @@ -25,8 +25,8 @@ * When this is set as the head of the list, an instance of it can function as a drop-in replacement for {@link android.util.Log}. Most of the methods in this class server only to map a method call in Log to its equivalent in LogNode. *

*/ -public class OXLog { - private static final String TAG = OXLog.class.getSimpleName(); +public class LogUtil { + private static final String TAG = LogUtil.class.getSimpleName(); // Grabbing the native values from Android's native logging facilities, // to make for easy migration and interop. diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/ntv/NativeUtils.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/ntv/NativeUtils.java index 9dfd38dd4..aeb7eaf04 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/ntv/NativeUtils.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/ntv/NativeUtils.java @@ -16,18 +16,18 @@ package org.prebid.mobile.rendering.utils.ntv; -import androidx.annotation.NonNull; - import org.prebid.mobile.rendering.bidding.data.NativeFetchDemandResult; import org.prebid.mobile.rendering.bidding.data.bid.BidResponse; import org.prebid.mobile.rendering.bidding.data.ntv.NativeAd; import org.prebid.mobile.rendering.bidding.data.ntv.NativeAdParser; import org.prebid.mobile.rendering.bidding.display.BidResponseCache; import org.prebid.mobile.rendering.bidding.listeners.NativeAdCallback; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.util.Map; +import androidx.annotation.NonNull; + public class NativeUtils { private static final String TAG = NativeUtils.class.getSimpleName(); @@ -39,7 +39,7 @@ public static void findNativeAd( final Map keyWordsMap = fetchDemandResult.getKeyWordsMap(); if (keyWordsMap == null || keyWordsMap.isEmpty()) { - OXLog.error(TAG, "findNativeAd: Failed. Callback or keyword map is null."); + LogUtil.error(TAG, "findNativeAd: Failed. Callback or keyword map is null."); return; } @@ -47,7 +47,7 @@ public static void findNativeAd( final BidResponse bidResponse = BidResponseCache.getInstance().popBidResponse(responseId); if (bidResponse == null || bidResponse.getWinningBid() == null) { - OXLog.debug(TAG, "findNativeAd: Returning null. BidResponse is null or winning bid is null."); + LogUtil.debug(TAG, "findNativeAd: Returning null. BidResponse is null or winning bid is null."); callback.onNativeAdReceived(null); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/UrlHandler.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/UrlHandler.java index f740eb9dd..a99f03c78 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/UrlHandler.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/UrlHandler.java @@ -21,13 +21,9 @@ import android.os.AsyncTask; import android.text.TextUtils; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.mraid.methods.network.UrlResolutionTask; import org.prebid.mobile.rendering.networking.tracking.TrackingManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.utils.url.action.BrowserAction; import org.prebid.mobile.rendering.utils.url.action.DeepLinkAction; import org.prebid.mobile.rendering.utils.url.action.DeepLinkPlusAction; @@ -38,6 +34,10 @@ import java.util.List; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + /** * {@code UrlHandler} facilitates handling user clicks on different URLs, allowing configuration * for which kinds of URLs to handle and then responding accordingly for a given URL. @@ -134,7 +134,7 @@ private UrlHandler(Set supportedUrlActionList, UrlHandlerResultListen public void handleUrl(Context context, String url, List trackingUrls, boolean isFromUserAction) { if (url == null || TextUtils.isEmpty(url.trim())) { mUrlHandlerResultListener.onFailure(url); - OXLog.error(TAG, "handleUrl(): Attempted to handle empty url."); + LogUtil.error(TAG, "handleUrl(): Attempted to handle empty url."); return; } @@ -149,7 +149,7 @@ public void onSuccess(@NonNull String resolvedUrl) { public void onFailure(@NonNull String message, @Nullable Throwable throwable) { mTaskPending = false; mUrlHandlerResultListener.onFailure(url); - OXLog.error(TAG, message); + LogUtil.error(TAG, message); } }; @@ -172,7 +172,7 @@ public boolean handleResolvedUrl(@NonNull final Context context, final boolean isFromUserAction) { if (TextUtils.isEmpty(url)) { mUrlHandlerResultListener.onFailure(url); - OXLog.error(TAG, "handleResolvedUrl(): Attempted to handle empty url."); + LogUtil.error(TAG, "handleResolvedUrl(): Attempted to handle empty url."); return false; } @@ -186,7 +186,7 @@ public boolean handleResolvedUrl(@NonNull final Context context, return true; } catch (ActionNotResolvedException e) { - OXLog.error(TAG, "handleResolvedUrl(): Unable to handle action: " + urlAction + " for given uri: " + destinationUri); + LogUtil.error(TAG, "handleResolvedUrl(): Unable to handle action: " + urlAction + " for given uri: " + destinationUri); } } } @@ -217,7 +217,7 @@ private void notifySuccess(@NonNull String url, @Nullable List trackingUrlList, UrlAction urlAction) { if (mAlreadySucceeded || mTaskPending) { - OXLog.warn(TAG, "notifySuccess(): Action is finished or action is still pending."); + LogUtil.warn(TAG, "notifySuccess(): Action is finished or action is still pending."); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/action/DeepLinkPlusAction.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/action/DeepLinkPlusAction.java index 95ad8b128..5ce1993a0 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/action/DeepLinkPlusAction.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/action/DeepLinkPlusAction.java @@ -21,7 +21,7 @@ import org.prebid.mobile.rendering.networking.tracking.TrackingManager; import org.prebid.mobile.rendering.utils.helpers.ExternalViewerUtils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.utils.url.ActionNotResolvedException; import org.prebid.mobile.rendering.utils.url.UrlHandler; @@ -83,7 +83,7 @@ public void performAction(Context context, UrlHandler urlHandler, Uri uri) return; } catch (ActionNotResolvedException e) { - OXLog.debug(TAG, "performAction(): Primary URL failed. Attempting to process fallback URL"); + LogUtil.debug(TAG, "performAction(): Primary URL failed. Attempting to process fallback URL"); } // 3. Attempt to handle the fallback URL diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/action/MraidInternalBrowserAction.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/action/MraidInternalBrowserAction.java index 8b51a4af8..1a2af673a 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/action/MraidInternalBrowserAction.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/utils/url/action/MraidInternalBrowserAction.java @@ -21,20 +21,20 @@ import android.content.Intent; import android.net.Uri; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.models.internal.MraidVariableContainer; import org.prebid.mobile.rendering.mraid.methods.network.RedirectUrlListener; import org.prebid.mobile.rendering.sdk.PrebidRenderingSettings; import org.prebid.mobile.rendering.utils.helpers.ExternalViewerUtils; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.utils.url.ActionNotResolvedException; import org.prebid.mobile.rendering.utils.url.UrlHandler; import org.prebid.mobile.rendering.views.webview.mraid.BaseJSInterface; import java.lang.ref.WeakReference; +import androidx.annotation.VisibleForTesting; + public class MraidInternalBrowserAction implements UrlAction { private static final String TAG = MraidInternalBrowserAction.class.getSimpleName(); @@ -74,7 +74,7 @@ void handleInternalBrowserAction(final Context context, BaseJSInterface baseJSIn @Override public void onSuccess(String url, String contentType) { if (Utils.isMraidActionUrl(url) && context != null) { - OXLog.debug(TAG, "Redirection succeeded"); + LogUtil.debug(TAG, "Redirection succeeded"); Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -83,7 +83,7 @@ public void onSuccess(String url, String contentType) { context.getApplicationContext().startActivity(intent); } catch (ActivityNotFoundException e) { - OXLog.error(TAG, "Unable to open url " + url + ". Activity was not found"); + LogUtil.error(TAG, "Unable to open url " + url + ". Activity was not found"); } } else if (url != null && (url.startsWith(PrebidRenderingSettings.SCHEME_HTTP) || url.startsWith(PrebidRenderingSettings.SCHEME_HTTPS))) { @@ -99,7 +99,7 @@ else if (url != null && (url.startsWith(PrebidRenderingSettings.SCHEME_HTTP) || @Override public void onFailed() { // Nothing to do - OXLog.debug(TAG, "Open: redirection failed"); + LogUtil.debug(TAG, "Open: redirection failed"); } }); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/AdViewProgressUpdateTask.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/AdViewProgressUpdateTask.java index 885528145..a93ee5488 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/AdViewProgressUpdateTask.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/AdViewProgressUpdateTask.java @@ -25,7 +25,7 @@ import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.listeners.VideoCreativeViewListener; import org.prebid.mobile.rendering.models.AbstractCreative; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.lang.ref.WeakReference; @@ -83,7 +83,7 @@ protected Void doInBackground(Void... params) { long newCurrent = videoView.getCurrentPosition(); if (mVastVideoDuration != -1 && newCurrent >= mVastVideoDuration) { - OXLog.debug(VideoCreativeView.class.getName(), "VAST duration reached, video interrupted. VAST duration:" + mVastVideoDuration + " ms, Video duration: " + mDuration + " ms"); + LogUtil.debug(VideoCreativeView.class.getName(), "VAST duration reached, video interrupted. VAST duration:" + mVastVideoDuration + " ms, Video duration: " + mDuration + " ms"); videoView.forceStop(); } @@ -96,7 +96,7 @@ protected Void doInBackground(Void... params) { } } catch (Exception e) { - OXLog.error(TAG, "Getting currentPosition from VideoCreativeView failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Getting currentPosition from VideoCreativeView failed: " + Log.getStackTraceString(e)); } }); } @@ -110,7 +110,7 @@ protected Void doInBackground(Void... params) { } } catch (Exception e) { - OXLog.error(TAG, "Failed to publish video progress: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to publish video progress: " + Log.getStackTraceString(e)); } } mLastTime = System.currentTimeMillis(); @@ -119,7 +119,7 @@ protected Void doInBackground(Void... params) { while (mCurrent <= mDuration && !isCancelled()); } catch (Exception e) { - OXLog.error(TAG, "Failed to update video progress: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to update video progress: " + Log.getStackTraceString(e)); } return null; } @@ -137,23 +137,23 @@ protected void onProgressUpdate(Long... values) { return; } super.onProgressUpdate(values); - // OXLog.debug(TAG, "progress: " + values[0]); + // PbLog.debug(TAG, "progress: " + values[0]); //TODO - uncomment when we have to show the countdown on video //trackEventListener.countdown(values[1]); if (!mFirstQuartile && values[0] >= 25) { - OXLog.debug(TAG, "firstQuartile: " + values[0]); + LogUtil.debug(TAG, "firstQuartile: " + values[0]); mFirstQuartile = true; mTrackEventListener.onEvent(VideoAdEvent.Event.AD_FIRSTQUARTILE); } if (!mMidpoint && values[0] >= 50) { - OXLog.debug(TAG, "midpoint: " + values[0]); + LogUtil.debug(TAG, "midpoint: " + values[0]); mMidpoint = true; mTrackEventListener.onEvent(VideoAdEvent.Event.AD_MIDPOINT); } if (!mThirdQuartile && values[0] >= 75) { - OXLog.debug(TAG, "thirdQuartile: " + values[0]); + LogUtil.debug(TAG, "thirdQuartile: " + values[0]); mThirdQuartile = true; mTrackEventListener.onEvent(VideoAdEvent.Event.AD_THIRDQUARTILE); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/ExoPlayerView.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/ExoPlayerView.java index 7613932ab..d18218756 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/ExoPlayerView.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/ExoPlayerView.java @@ -20,9 +20,6 @@ import android.net.Uri; import android.widget.RelativeLayout; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.Player; @@ -34,9 +31,12 @@ import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.listeners.VideoCreativeViewListener; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.vast.VASTErrorCodes; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + public class ExoPlayerView extends PlayerView implements VideoPlayerView { private static final String TAG = "ExoPlayerView"; public static final float DEFAULT_INITIAL_VIDEO_VOLUME = 1.0f; @@ -67,7 +67,7 @@ public void onPlayerError(ExoPlaybackException error) { @Override public void onPlayerStateChanged(boolean playWhenReady, int playbackState) { if (mPlayer == null) { - OXLog.debug(TAG, "onPlayerStateChanged(): Skipping state handling. Player is null"); + LogUtil.debug(TAG, "onPlayerStateChanged(): Skipping state handling. Player is null"); return; } switch (playbackState) { @@ -99,7 +99,7 @@ public void unMute() { @Override public void start(float initialVolume) { - OXLog.debug(TAG, "start() called"); + LogUtil.debug(TAG, "start() called"); initLayout(); initPlayer(initialVolume); preparePlayer(true); @@ -136,14 +136,14 @@ public float getVolume() { @Override public void resume() { - OXLog.debug(TAG, "resume() called"); + LogUtil.debug(TAG, "resume() called"); preparePlayer(false); mVideoCreativeViewListener.onEvent(VideoAdEvent.Event.AD_RESUME); } @Override public void pause() { - OXLog.debug(TAG, "pause() called"); + LogUtil.debug(TAG, "pause() called"); if (mPlayer != null) { mPlayer.stop(); mVideoCreativeViewListener.onEvent(VideoAdEvent.Event.AD_PAUSE); @@ -158,7 +158,7 @@ public void forceStop() { @Override public void destroy() { - OXLog.debug(TAG, "destroy() called"); + LogUtil.debug(TAG, "destroy() called"); killUpdateTask(); if (mPlayer != null) { mPlayer.stop(); @@ -193,7 +193,7 @@ private void initLayout() { private void initPlayer(float initialVolume) { if (mPlayer != null) { - OXLog.debug(TAG, "Skipping initPlayer(): Player is already initialized."); + LogUtil.debug(TAG, "Skipping initPlayer(): Player is already initialized."); return; } mPlayer = ExoPlayerFactory.newSimpleInstance(getContext()); @@ -205,7 +205,7 @@ private void initPlayer(float initialVolume) { private void initUpdateTask() { if (mAdViewProgressUpdateTask != null) { - OXLog.debug(TAG, "initUpdateTask: AdViewProgressUpdateTask is already initialized. Skipping."); + LogUtil.debug(TAG, "initUpdateTask: AdViewProgressUpdateTask is already initialized. Skipping."); return; } @@ -223,7 +223,7 @@ private void initUpdateTask() { void preparePlayer(boolean resetPosition) { ExtractorMediaSource extractorMediaSource = buildMediaSource(mVideoUri); if (extractorMediaSource == null || mPlayer == null) { - OXLog.debug(TAG, "preparePlayer(): ExtractorMediaSource or SimpleExoPlayer is null. Skipping prepare."); + LogUtil.debug(TAG, "preparePlayer(): ExtractorMediaSource or SimpleExoPlayer is null. Skipping prepare."); return; } mPlayer.prepare(extractorMediaSource, resetPosition, true); @@ -239,7 +239,7 @@ private ExtractorMediaSource buildMediaSource(Uri uri) { } private void killUpdateTask() { - OXLog.debug(TAG, "killUpdateTask() called"); + LogUtil.debug(TAG, "killUpdateTask() called"); if (mAdViewProgressUpdateTask != null) { mAdViewProgressUpdateTask.cancel(true); mAdViewProgressUpdateTask = null; diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/LruController.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/LruController.java index 875ea8ab1..27a3725b6 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/LruController.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/LruController.java @@ -19,14 +19,14 @@ import android.content.Context; import android.util.LruCache; -import androidx.annotation.NonNull; - -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; +import androidx.annotation.NonNull; + public class LruController { private final static String TAG = LruController.class.getSimpleName(); @@ -64,12 +64,12 @@ public static boolean saveCacheToFile( os.write(data); os.close(); mLruCache.remove(videoPath); - OXLog.debug(TAG, "Cache saved to file"); + LogUtil.debug(TAG, "Cache saved to file"); return true; } catch (Exception e) { - OXLog.error(TAG, "Failed to save cache to file: " + e.getMessage()); + LogUtil.error(TAG, "Failed to save cache to file: " + e.getMessage()); } } return false; diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreative.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreative.java index 85e830f0d..e9c6bdde6 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreative.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreative.java @@ -22,9 +22,6 @@ import android.text.TextUtils; import android.view.View; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.interstitial.InterstitialManagerVideoDelegate; import org.prebid.mobile.rendering.listeners.CreativeViewListener; @@ -39,12 +36,15 @@ import org.prebid.mobile.rendering.session.manager.OmAdSessionManager; import org.prebid.mobile.rendering.utils.helpers.AppInfoManager; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import java.io.File; import java.lang.ref.WeakReference; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + public class VideoCreative extends VideoCreativeProtocol implements VideoCreativeViewListener, InterstitialManagerVideoDelegate { private static final String TAG = VideoCreative.class.getSimpleName(); @@ -103,7 +103,7 @@ public void display() { @Override public void skip() { - OXLog.debug(TAG, "Track 'skip' event"); + LogUtil.debug(TAG, "Track 'skip' event"); mModel.trackVideoEvent(VideoAdEvent.Event.AD_SKIP); // Send it to AdView getCreativeViewListener().creativeDidComplete(this); @@ -144,7 +144,7 @@ public void onVolumeChanged(float volume) { OmAdSessionManager omAdSessionManager = mWeakOmAdSessionManager.get(); if (omAdSessionManager == null) { - OXLog.error(TAG, "trackVolume failed, OmAdSessionManager is null"); + LogUtil.error(TAG, "trackVolume failed, OmAdSessionManager is null"); return; } omAdSessionManager.trackVolumeChange(volume); @@ -214,7 +214,7 @@ public void unmute() { public void createOmAdSession() { OmAdSessionManager omAdSessionManager = mWeakOmAdSessionManager.get(); if (omAdSessionManager == null) { - OXLog.error(TAG, "Error creating AdSession. OmAdSessionManager is null"); + LogUtil.error(TAG, "Error creating AdSession. OmAdSessionManager is null"); return; } @@ -343,12 +343,12 @@ private void startOmSession() { OmAdSessionManager omAdSessionManager = mWeakOmAdSessionManager.get(); if (omAdSessionManager == null) { - OXLog.error(TAG, "startOmSession: Failed. omAdSessionManager is null"); + LogUtil.error(TAG, "startOmSession: Failed. omAdSessionManager is null"); return; } if (mVideoCreativeView == null) { - OXLog.error(TAG, "startOmSession: Failed. VideoCreativeView is null"); + LogUtil.error(TAG, "startOmSession: Failed. VideoCreativeView is null"); return; } @@ -358,7 +358,7 @@ private void startOmSession() { private void trackVideoAdStart() { if (mVideoCreativeView == null || mVideoCreativeView.getVideoPlayerView() == null) { - OXLog.error(TAG, "trackVideoAdStart error. mVideoCreativeView or VideoPlayerView is null."); + LogUtil.error(TAG, "trackVideoAdStart error. mVideoCreativeView or VideoPlayerView is null."); return; } @@ -370,7 +370,7 @@ private void trackVideoAdStart() { } protected void complete() { - OXLog.debug(TAG, "track 'complete' event"); + LogUtil.debug(TAG, "track 'complete' event"); mModel.trackVideoEvent(VideoAdEvent.Event.AD_COMPLETE); @@ -432,7 +432,7 @@ private static class VideoCreativeVideoPreloadListener implements FileDownloadLi public void onFileDownloaded(String shortenedPath) { VideoCreative videoCreative = mWeakVideoCreative.get(); if (videoCreative == null) { - OXLog.warn(TAG, "VideoCreative is null"); + LogUtil.warn(TAG, "VideoCreative is null"); return; } @@ -445,7 +445,7 @@ public void onFileDownloaded(String shortenedPath) { public void onFileDownloadError(String error) { VideoCreative videoCreative = mWeakVideoCreative.get(); if (videoCreative == null) { - OXLog.warn(TAG, "VideoCreative is null"); + LogUtil.warn(TAG, "VideoCreative is null"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreativeModel.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreativeModel.java index 81a839dc9..a5c1ad439 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreativeModel.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreativeModel.java @@ -20,7 +20,7 @@ import org.prebid.mobile.rendering.models.CreativeModel; import org.prebid.mobile.rendering.models.internal.InternalPlayerState; import org.prebid.mobile.rendering.networking.tracking.TrackingManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.vast.AdVerifications; import java.util.ArrayList; @@ -57,13 +57,13 @@ public void trackVideoEvent(VideoAdEvent.Event videoEvent) { mOmEventTracker.trackOmVideoAdEvent(videoEvent); ArrayList urls = mVideoEventUrls.get(videoEvent); if (urls == null) { - OXLog.debug(TAG, "Event" + videoEvent + " not found"); + LogUtil.debug(TAG, "Event" + videoEvent + " not found"); return; } mTrackingManager.fireEventTrackingURLs(urls); - OXLog.info(TAG, "Video event '" + videoEvent.name() + "' was fired with urls: " + urls.toString()); + LogUtil.info(TAG, "Video event '" + videoEvent.name() + "' was fired with urls: " + urls.toString()); } public void trackPlayerStateChange(InternalPlayerState changedPlayerState) { diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreativeView.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreativeView.java index 0a3eb7da1..513d4b719 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreativeView.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoCreativeView.java @@ -21,14 +21,12 @@ import android.view.View; import android.widget.RelativeLayout; -import androidx.annotation.Nullable; - import org.prebid.mobile.rendering.R; import org.prebid.mobile.rendering.errors.AdException; import org.prebid.mobile.rendering.listeners.VideoCreativeViewListener; import org.prebid.mobile.rendering.models.ViewPool; import org.prebid.mobile.rendering.utils.helpers.Dips; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.utils.url.UrlHandler; import org.prebid.mobile.rendering.utils.url.action.BrowserAction; import org.prebid.mobile.rendering.utils.url.action.DeepLinkAction; @@ -36,6 +34,8 @@ import org.prebid.mobile.rendering.utils.url.action.UrlAction; import org.prebid.mobile.rendering.views.VolumeControlView; +import androidx.annotation.Nullable; + import static android.widget.RelativeLayout.LayoutParams.MATCH_PARENT; import static android.widget.RelativeLayout.LayoutParams.WRAP_CONTENT; import static org.prebid.mobile.rendering.models.AdConfiguration.AdUnitIdentifierType.VAST; @@ -63,7 +63,7 @@ public VideoCreativeView(Context context, VideoCreativeViewListener videoCreativ public void setVideoUri(Uri videoUri) { if (videoUri == null) { - OXLog.error(TAG, "setVideoUri: Failed. Provided uri is null."); + LogUtil.error(TAG, "setVideoUri: Failed. Provided uri is null."); return; } @@ -212,7 +212,7 @@ private void addVolumeControlView() { private void handleCallToActionClick() { if (mUrlHandleInProgress) { - OXLog.debug(TAG, "handleCallToActionClick: Skipping. Url handle in progress"); + LogUtil.debug(TAG, "handleCallToActionClick: Skipping. Url handle in progress"); return; } mUrlHandleInProgress = true; @@ -242,7 +242,7 @@ public void onSuccess(String url, UrlAction urlAction) { @Override public void onFailure(String url) { mUrlHandleInProgress = false; - OXLog.debug(TAG, "Failed to handleUrl: " + url + ". Handling fallback"); + LogUtil.debug(TAG, "Failed to handleUrl: " + url + ". Handling fallback"); } }) .build(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoDownloadTask.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoDownloadTask.java index e9d7b61e1..86ef5fa4e 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoDownloadTask.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/video/VideoDownloadTask.java @@ -24,7 +24,7 @@ import org.prebid.mobile.rendering.loading.FileDownloadListener; import org.prebid.mobile.rendering.loading.FileDownloadTask; import org.prebid.mobile.rendering.models.AdConfiguration; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.io.ByteArrayOutputStream; import java.io.File; @@ -58,8 +58,8 @@ public VideoDownloadTask(Context context, File file, FileDownloadListener fileDo @Override public GetUrlResult sendRequest(GetUrlParams param) throws Exception { - OXLog.debug(TAG, "url: " + param.url); - OXLog.debug(TAG, "queryParams: " + param.queryParams); + LogUtil.debug(TAG, "url: " + param.url); + LogUtil.debug(TAG, "queryParams: " + param.queryParams); return createResult(param); } @@ -74,13 +74,13 @@ private String getShortenedPath() { protected void processData(URLConnection connection, GetUrlResult result) throws IOException { String shortenedPath = getShortenedPath(); if (mFile.exists() && !LruController.isAlreadyCached(shortenedPath)) { - OXLog.debug(TAG, "Video saved to cache"); + LogUtil.debug(TAG, "Video saved to cache"); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); readAndWriteData(connection, result, outputStream, false); LruController.putVideoCache(shortenedPath, outputStream.toByteArray()); } else { - OXLog.debug(TAG, "Video saved to file: " + shortenedPath); + LogUtil.debug(TAG, "Video saved to file: " + shortenedPath); readAndWriteData(connection, result, new FileOutputStream(mFile), true); } } @@ -136,9 +136,9 @@ private GetUrlResult createResult(GetUrlParams param) mResult = new GetUrlResult(); String shortenedPath = getShortenedPath(); if (mFile.exists()) { - OXLog.debug(TAG, "File exists: " + shortenedPath); + LogUtil.debug(TAG, "File exists: " + shortenedPath); if (isVideoFileExpired(mFile) || !isVideoFileValid(mApplicationContext, mFile)) { - OXLog.debug(TAG, "File " + shortenedPath + " is expired or broken. Downloading a new one"); + LogUtil.debug(TAG, "File " + shortenedPath + " is expired or broken. Downloading a new one"); mFile.delete(); mResult = super.sendRequest(param); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/AdViewManager.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/AdViewManager.java index 802ab7014..471bcf945 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/AdViewManager.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/AdViewManager.java @@ -37,7 +37,7 @@ import org.prebid.mobile.rendering.models.internal.InternalFriendlyObstruction; import org.prebid.mobile.rendering.models.internal.InternalPlayerState; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.video.VideoAdEvent; import org.prebid.mobile.rendering.video.VideoCreative; import org.prebid.mobile.rendering.video.VideoCreativeView; @@ -87,7 +87,7 @@ public void onFetchingCompleted(Transaction transaction) { @Override public void onFetchingFailed(AdException exception) { - OXLog.error(TAG, "There was an error fetching an ad " + exception.toString()); + LogUtil.error(TAG, "There was an error fetching an ad " + exception.toString()); mAdViewListener.failedToLoad(exception); } @@ -98,7 +98,7 @@ public void creativeWasClicked(AbstractCreative creative, String url) { @Override public void creativeInterstitialDidClose(AbstractCreative creative) { - OXLog.debug(TAG, "creativeInterstitialDidClose"); + LogUtil.debug(TAG, "creativeInterstitialDidClose"); Transaction currentTransaction = mTransactionManager.getCurrentTransaction(); if (creative.isDisplay() && creative.isEndCard()) { @@ -151,7 +151,7 @@ public void creativeResumed(AbstractCreative creative) { @Override public void creativeDidComplete(AbstractCreative creative) { - OXLog.debug(TAG, "creativeDidComplete"); + LogUtil.debug(TAG, "creativeDidComplete"); // NOTE: This is currently hard-wired to work for video + end card only // To truly support continuous ads in a queue, there would need to be significant changes @@ -180,7 +180,7 @@ public void resetTransactionState() { public void hide() { if (mCurrentCreative == null) { - OXLog.warn(TAG, "Can not hide a null creative"); + LogUtil.warn(TAG, "Can not hide a null creative"); return; } @@ -192,7 +192,7 @@ public void hide() { public void setAdVisibility(int visibility) { if (mCurrentCreative == null) { - OXLog.debug(TAG, "setAdVisibility(): Skipping creative window focus notification. mCurrentCreative is null"); + LogUtil.debug(TAG, "setAdVisibility(): Skipping creative window focus notification. mCurrentCreative is null"); return; } @@ -316,12 +316,12 @@ public long getSkipOffset() { public void addObstructions(InternalFriendlyObstruction... friendlyObstructions) { if (friendlyObstructions == null || friendlyObstructions.length == 0) { - OXLog.debug(TAG, "addObstructions(): Failed. Obstructions list is empty or null"); + LogUtil.debug(TAG, "addObstructions(): Failed. Obstructions list is empty or null"); return; } if (mCurrentCreative == null) { - OXLog.debug(TAG, "addObstructions(): Failed. Current creative is null."); + LogUtil.debug(TAG, "addObstructions(): Failed. Current creative is null."); return; } @@ -332,12 +332,12 @@ public void addObstructions(InternalFriendlyObstruction... friendlyObstructions) public void show() { if (!isCreativeResolved()) { - OXLog.debug(TAG, "Couldn't proceed show(): Video or HTML is not resolved."); + LogUtil.debug(TAG, "Couldn't proceed show(): Video or HTML is not resolved."); return; } AbstractCreative creative = mTransactionManager.getCurrentCreative(); if (creative == null) { - OXLog.error(TAG, "Show called with no ad"); + LogUtil.error(TAG, "Show called with no ad"); return; } // Display current creative @@ -384,7 +384,7 @@ private void handleVideoCreativeComplete(AbstractCreative creative) { private void handleCreativeDisplay() { View creativeView = mCurrentCreative.getCreativeView(); if (creativeView == null) { - OXLog.error(TAG, "Creative has no view"); + LogUtil.error(TAG, "Creative has no view"); return; } @@ -425,13 +425,13 @@ private void handleAutoDisplay() { show(); } else { - OXLog.info(TAG, "AdViewManager - Ad will be displayed when show is called"); + LogUtil.info(TAG, "AdViewManager - Ad will be displayed when show is called"); } } private void addHtmlInterstitialObstructions(ViewGroup rootViewGroup) { if (rootViewGroup == null) { - OXLog.debug(TAG, "addHtmlInterstitialObstructions(): rootViewGroup is null."); + LogUtil.debug(TAG, "addHtmlInterstitialObstructions(): rootViewGroup is null."); return; } View closeButtonView = rootViewGroup.findViewById(R.id.iv_close_interstitial); @@ -453,7 +453,7 @@ private void processTransaction(Transaction transaction) { trackAdLoaded(); } catch (Exception e) { - OXLog.error(TAG, "adLoaded failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "adLoaded failed: " + Log.getStackTraceString(e)); } handleAutoDisplay(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/base/BaseAdView.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/base/BaseAdView.java index 6dae1eaf9..8aea4c2b0 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/base/BaseAdView.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/base/BaseAdView.java @@ -26,7 +26,7 @@ import org.prebid.mobile.rendering.sdk.PrebidRenderingSettings; import org.prebid.mobile.rendering.utils.broadcast.local.EventForwardingLocalBroadcastReceiver; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.AdViewManager; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; @@ -74,7 +74,7 @@ public long getMediaOffset() { public void setContentUrl(String contentUrl) { if (mAdViewManager == null) { - OXLog.error(TAG, "setContentUrl: Failed. AdViewManager is null"); + LogUtil.error(TAG, "setContentUrl: Failed. AdViewManager is null"); return; } mAdViewManager.getAdConfiguration().setContentUrl(contentUrl); @@ -105,7 +105,7 @@ protected void setScreenVisibility(int screenVisibility) { } protected void handleBroadcastAction(String action) { - OXLog.debug(TAG, "handleBroadcastAction: parent method executed. No default action handling. " + action); + LogUtil.debug(TAG, "handleBroadcastAction: parent method executed. No default action handling. " + action); } protected void handleWindowFocusChange(boolean hasWindowFocus) { diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/browser/AdBrowserActivityWebViewClient.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/browser/AdBrowserActivityWebViewClient.java index cd0bf3b56..cf1d1bfec 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/browser/AdBrowserActivityWebViewClient.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/browser/AdBrowserActivityWebViewClient.java @@ -19,7 +19,7 @@ import android.webkit.WebView; import android.webkit.WebViewClient; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.utils.url.UrlHandler; import org.prebid.mobile.rendering.utils.url.action.DeepLinkAction; import org.prebid.mobile.rendering.utils.url.action.DeepLinkPlusAction; @@ -75,7 +75,7 @@ public void onSuccess(String url, UrlAction urlAction) { @Override public void onFailure(String url) { - OXLog.debug(TAG, "Failed to handleUrl: " + url); + LogUtil.debug(TAG, "Failed to handleUrl: " + url); mUrlHandleInProgress = false; } }) diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/browser/BrowserControls.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/browser/BrowserControls.java index 21abe61ec..24d42729f 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/browser/BrowserControls.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/browser/BrowserControls.java @@ -28,11 +28,11 @@ import android.widget.TableLayout; import android.widget.TableRow; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.R; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; + +import androidx.annotation.VisibleForTesting; final class BrowserControls extends TableLayout { private static String TAG = BrowserControls.class.getSimpleName(); @@ -65,7 +65,7 @@ public BrowserControls(Context context, BrowserControlsEventsListener listener) public void updateNavigationButtonsState() { mUIHandler.post(() -> { if (mBrowserControlsEventsListener == null) { - OXLog.error(TAG, "updateNavigationButtonsState: Unable to update state. mBrowserControlsEventsListener is null"); + LogUtil.error(TAG, "updateNavigationButtonsState: Unable to update state. mBrowserControlsEventsListener is null"); return; } @@ -88,7 +88,7 @@ public void updateNavigationButtonsState() { private void bindEventListeners() { mCloseBtn.setOnClickListener(v -> { if (mBrowserControlsEventsListener == null) { - OXLog.error(TAG, "Close button click failed: mBrowserControlsEventsListener is null"); + LogUtil.error(TAG, "Close button click failed: mBrowserControlsEventsListener is null"); return; } mBrowserControlsEventsListener.closeBrowser(); @@ -96,7 +96,7 @@ private void bindEventListeners() { mBackBtn.setOnClickListener(v -> { if (mBrowserControlsEventsListener == null) { - OXLog.error(TAG, "Back button click failed: mBrowserControlsEventsListener is null"); + LogUtil.error(TAG, "Back button click failed: mBrowserControlsEventsListener is null"); return; } mBrowserControlsEventsListener.onGoBack(); @@ -104,7 +104,7 @@ private void bindEventListeners() { mForthBtn.setOnClickListener(v -> { if (mBrowserControlsEventsListener == null) { - OXLog.error(TAG, "Forward button click failed: mBrowserControlsEventsListener is null"); + LogUtil.error(TAG, "Forward button click failed: mBrowserControlsEventsListener is null"); return; } mBrowserControlsEventsListener.onGoForward(); @@ -112,7 +112,7 @@ private void bindEventListeners() { mRefreshBtn.setOnClickListener(v -> { if (mBrowserControlsEventsListener == null) { - OXLog.error(TAG, "Refresh button click failed: mBrowserControlsEventsListener is null"); + LogUtil.error(TAG, "Refresh button click failed: mBrowserControlsEventsListener is null"); return; } mBrowserControlsEventsListener.onRelaod(); @@ -126,7 +126,7 @@ private void bindEventListeners() { } if (url == null) { - OXLog.error(TAG, "Open external link failed. url is null"); + LogUtil.error(TAG, "Open external link failed. url is null"); return; } @@ -143,7 +143,7 @@ public void openURLInExternalBrowser(String url) { getContext().startActivity(intent); } catch (Exception e) { - OXLog.error(TAG, "Could not handle intent: " + url + " : " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Could not handle intent: " + url + " : " + Log.getStackTraceString(e)); } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/interstitial/InterstitialManager.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/interstitial/InterstitialManager.java index e9245608e..8e0f6345c 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/interstitial/InterstitialManager.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/interstitial/InterstitialManager.java @@ -34,7 +34,7 @@ import org.prebid.mobile.rendering.models.HTMLCreative; import org.prebid.mobile.rendering.models.InterstitialDisplayPropertiesInternal; import org.prebid.mobile.rendering.mraid.methods.InterstitialManagerMraidDelegate; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.AdViewManager; import org.prebid.mobile.rendering.views.webview.PrebidWebViewInterstitial; import org.prebid.mobile.rendering.views.webview.WebViewBanner; @@ -101,7 +101,7 @@ public void displayPrebidWebViewForMraid(final WebViewBase adBaseView, // Note: The context should be the Activity this view will display on top of public void displayAdViewInInterstitial(Context context, View view) { if (!(context instanceof Activity)) { - OXLog.error(TAG, "displayAdViewInInterstitial(): Can not display interstitial without activity context"); + LogUtil.error(TAG, "displayAdViewInInterstitial(): Can not display interstitial without activity context"); return; } @@ -115,8 +115,8 @@ public void displayAdViewInInterstitial(Context context, View view) { public void displayVideoAdViewInInterstitial(Context context, View adView) { if (!(context instanceof Activity && adView instanceof VideoView)) { - OXLog.error(TAG, "displayAdViewInInterstitial(): Can not display interstitial. " - + "Context is not activity or adView is not an instance of VideoAdView"); + LogUtil.error(TAG, "displayAdViewInInterstitial(): Can not display interstitial. " + + "Context is not activity or adView is not an instance of VideoAdView"); return; } show(); @@ -150,7 +150,7 @@ public void interstitialAdClosed() { @Override public void interstitialClosed(View viewToClose) { - OXLog.debug(TAG, "interstitialClosed"); + LogUtil.debug(TAG, "interstitialClosed"); try { if (!mViewStack.isEmpty() && mMraidDelegate != null) { @@ -180,14 +180,14 @@ public void interstitialClosed(View viewToClose) { } } catch (Exception e) { - OXLog.error(TAG, "InterstitialClosed failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "InterstitialClosed failed: " + Log.getStackTraceString(e)); } } @Override public void interstitialDialogShown(ViewGroup rootViewGroup) { if (mInterstitialDisplayDelegate == null) { - OXLog.debug(TAG, "interstitialDialogShown(): Failed. mInterstitialDelegate == null"); + LogUtil.debug(TAG, "interstitialDialogShown(): Failed. mInterstitialDelegate == null"); return; } mInterstitialDisplayDelegate.interstitialDialogShown(rootViewGroup); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/interstitial/InterstitialVideo.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/interstitial/InterstitialVideo.java index 880cae706..7526b4818 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/interstitial/InterstitialVideo.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/interstitial/InterstitialVideo.java @@ -35,7 +35,7 @@ import org.prebid.mobile.rendering.interstitial.AdBaseDialog; import org.prebid.mobile.rendering.models.AdConfiguration; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.base.BaseAdView; import org.prebid.mobile.rendering.views.webview.mraid.Views; @@ -140,12 +140,12 @@ public void scheduleShowCloseBtnTask(View adView) { public void scheduleShowCloseBtnTask(View adView, int closeDelayInMs) { long delayInMs = getCloseDelayInMs(adView, closeDelayInMs); if (delayInMs == 0) { - OXLog.debug(TAG, "Delay is 0. Not scheduling skip button show."); + LogUtil.debug(TAG, "Delay is 0. Not scheduling skip button show."); return; } long videoLength = getDuration(adView); - OXLog.debug(TAG, "Video length: " + videoLength); + LogUtil.debug(TAG, "Video length: " + videoLength); if (videoLength <= delayInMs) { // Short video, show close at the end mShowCloseBtnOnComplete = true; @@ -159,14 +159,14 @@ public void scheduleShowCloseBtnTask(View adView, int closeDelayInMs) { } public void pauseVideo() { - OXLog.debug(TAG, "pauseVideo"); + LogUtil.debug(TAG, "pauseVideo"); mVideoPaused = true; stopTimer(); stopCountDownTimer(); } public void resumeVideo() { - OXLog.debug(TAG, "resumeVideo"); + LogUtil.debug(TAG, "resumeVideo"); mVideoPaused = false; if (getRemainingTimerTimeInMs() != AdConfiguration.SKIP_OFFSET_NOT_ASSIGNED && getRemainingTimerTimeInMs() > 500L) { @@ -195,7 +195,7 @@ public void queueUIThreadTask(Runnable task) { } public void close() { - OXLog.debug(TAG, "closeableAdContainer - onClose()"); + LogUtil.debug(TAG, "closeableAdContainer - onClose()"); cancel(); //IMPORTANT: call interstitialClosed() so it sends back to the mAdViewContainer to reimplant after closing an ad. @@ -246,7 +246,7 @@ private long getCloseDelayInMs(View adView, int closeDelayInMs) { if (delayInMs == AdConfiguration.SKIP_OFFSET_NOT_ASSIGNED) { delayInMs = CLOSE_DELAY_DEFAULT_IN_MS; } - OXLog.debug(TAG, "Picked skip offset: " + delayInMs + " ms."); + LogUtil.debug(TAG, "Picked skip offset: " + delayInMs + " ms."); return delayInMs; } @@ -267,7 +267,7 @@ public void run() { } } catch (Exception e) { - OXLog.error(TAG, "Failed to render custom close icon: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to render custom close icon: " + Log.getStackTraceString(e)); } }); } @@ -316,7 +316,7 @@ private void handleAdViewShow() { @VisibleForTesting protected void scheduleTimer(long delayInMs) { - OXLog.debug(TAG, "Scheduling timer at: " + delayInMs); + LogUtil.debug(TAG, "Scheduling timer at: " + delayInMs); stopTimer(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/AdWebViewClient.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/AdWebViewClient.java index de1627c6e..a1cf3d9dd 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/AdWebViewClient.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/AdWebViewClient.java @@ -24,7 +24,7 @@ import android.webkit.WebView; import android.webkit.WebViewClient; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import java.util.HashSet; @@ -59,7 +59,7 @@ public AdWebViewClient(AdAssetsLoadedListener adAssetsLoadedListener) { @Override public void onPageStarted(WebView view, String url, Bitmap favicon) { if (view == null) { - OXLog.error(TAG, "onPageStarted failed, WebView is null"); + LogUtil.error(TAG, "onPageStarted failed, WebView is null"); return; } @@ -73,17 +73,17 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) { mAdAssetsLoadedListener.startLoadingAssets(); } catch (Exception e) { - OXLog.error(TAG, "onPageStarted failed for url: " + url + " : " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "onPageStarted failed for url: " + url + " : " + Log.getStackTraceString(e)); } } @Override public void onPageFinished(WebView view, String url) { if (view == null) { - OXLog.error(TAG, "onPageFinished failed, WebView is null"); + LogUtil.error(TAG, "onPageFinished failed, WebView is null"); return; } - OXLog.debug(TAG, "onPageFinished: " + view); + LogUtil.debug(TAG, "onPageFinished: " + view); try { mAdAssetsLoadedListener.adAssetsLoaded(); @@ -91,14 +91,14 @@ public void onPageFinished(WebView view, String url) { view.setBackgroundColor(Color.TRANSPARENT); } catch (Exception e) { - OXLog.error(TAG, "onPageFinished failed for url: " + url + " : " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "onPageFinished failed for url: " + url + " : " + Log.getStackTraceString(e)); } } @Override public void onLoadResource(WebView view, String url) { if (view == null) { - OXLog.error(TAG, "onPageStarted failed, WebView is null"); + LogUtil.error(TAG, "onPageStarted failed, WebView is null"); return; } @@ -128,16 +128,16 @@ public void onLoadResource(WebView view, String url) { super.onLoadResource(view, url); } catch (Exception e) { - OXLog.error(TAG, "onLoadResource failed for url: " + url + " : " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "onLoadResource failed for url: " + url + " : " + Log.getStackTraceString(e)); } } //gets called when an ad is clicked by user. Takes user to the browser or such @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { - OXLog.debug(TAG, "shouldOverrideUrlLoading, url: " + url); + LogUtil.debug(TAG, "shouldOverrideUrlLoading, url: " + url); if (view == null) { - OXLog.error(TAG, "onPageStarted failed, WebView is null"); + LogUtil.error(TAG, "onPageStarted failed, WebView is null"); return false; } @@ -153,7 +153,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) { handleWebViewClick(url, webViewBase); } catch (Exception e) { - OXLog.error(TAG, "shouldOverrideUrlLoading failed for url: " + url + " : " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "shouldOverrideUrlLoading failed for url: " + url + " : " + Log.getStackTraceString(e)); } return true; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewBanner.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewBanner.java index b3c52fecd..d60768591 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewBanner.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewBanner.java @@ -28,7 +28,7 @@ import org.prebid.mobile.rendering.models.internal.MraidVariableContainer; import org.prebid.mobile.rendering.mraid.handler.FetchPropertiesHandler; import org.prebid.mobile.rendering.sdk.JSLibraryManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import org.prebid.mobile.rendering.views.webview.mraid.Views; @@ -45,7 +45,7 @@ public void onResult(String propertyJson) { @Override public void onError(Throwable throwable) { - OXLog.error(TAG, "executeGetExpandProperties failed: " + Log.getStackTraceString(throwable)); + LogUtil.error(TAG, "executeGetExpandProperties failed: " + Log.getStackTraceString(throwable)); } }; @@ -58,7 +58,7 @@ public PrebidWebViewBanner(Context context, InterstitialManager interstitialMana public void loadMraidExpandProperties() { Context context = getContext(); if (!(context instanceof Activity)) { - OXLog.warn(TAG, "Context is null or is not activity context"); + LogUtil.warn(TAG, "Context is null or is not activity context"); return; } @@ -77,7 +77,7 @@ public void loadMraidExpandProperties() { .executeGetExpandProperties(new FetchPropertiesHandler(mExpandPropertiesCallback)); } else { - OXLog.warn(TAG, "Error getting expand properties"); + LogUtil.warn(TAG, "Error getting expand properties"); } } @@ -121,7 +121,7 @@ public void preloaded(WebViewBase adBaseView) { if (adBaseView == null) { //This should never happen. - OXLog.error(TAG, "Failed to preload a banner ad. Webview is null."); + LogUtil.error(TAG, "Failed to preload a banner ad. Webview is null."); if (mWebViewDelegate != null) { mWebViewDelegate.webViewFailedToLoad(new AdException(AdException.INTERNAL_ERROR, "Preloaded adview is null!")); @@ -139,7 +139,7 @@ public void preloaded(WebViewBase adBaseView) { if (getChildCount() >= 1) { - OXLog.debug(TAG, "Adding second view"); + LogUtil.debug(TAG, "Adding second view"); //safe removal from parent before adding Views.removeFromParent(adBaseView); @@ -148,7 +148,7 @@ public void preloaded(WebViewBase adBaseView) { swapWebViews(); } else { - OXLog.debug(TAG, "Adding first view"); + LogUtil.debug(TAG, "Adding first view"); //safe removal from parent before adding Views.removeFromParent(adBaseView); @@ -157,7 +157,7 @@ public void preloaded(WebViewBase adBaseView) { } } else { - OXLog.debug(TAG, "Adding the only view"); + LogUtil.debug(TAG, "Adding the only view"); adBaseView.bringToFront(); swapWebViews(); @@ -216,7 +216,7 @@ private void handleExpandPropertiesResult(String expandProperties) { } } catch (Exception e) { - OXLog.error(TAG, "handleExpandPropertiesResult: Failed. Reason: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "handleExpandPropertiesResult: Failed. Reason: " + Log.getStackTraceString(e)); } } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewBase.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewBase.java index 59c64e61d..1b7207986 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewBase.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewBase.java @@ -34,7 +34,7 @@ import org.prebid.mobile.rendering.sdk.deviceData.managers.DeviceInfoManager; import org.prebid.mobile.rendering.utils.exposure.ViewExposure; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import org.prebid.mobile.rendering.views.webview.mraid.Views; @@ -104,7 +104,7 @@ public void initMraidExpanded() { readyForMraidExpanded(); } catch (Exception e) { - OXLog.error(TAG, "initMraidExpanded failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "initMraidExpanded failed: " + Log.getStackTraceString(e)); } }); } @@ -202,7 +202,7 @@ public void loadMraidExpandProperties() { protected void renderAdView(WebViewBase webViewBase) { if (webViewBase == null) { - OXLog.warn(TAG, "WebviewBase is null"); + LogUtil.warn(TAG, "WebviewBase is null"); return; } if (getContext() != null) { @@ -234,12 +234,12 @@ protected void displayAdViewPlacement(WebViewBase webViewBase) { private void renderPlacement(WebViewBase webViewBase, int width, int height) { if (mContext == null) { - OXLog.warn(TAG, "Context is null"); + LogUtil.warn(TAG, "Context is null"); return; } if (webViewBase == null) { - OXLog.warn(TAG, "WebviewBase is null"); + LogUtil.warn(TAG, "WebviewBase is null"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewInterstitial.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewInterstitial.java index d1b0317d1..a022cbef9 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewInterstitial.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/PrebidWebViewInterstitial.java @@ -19,7 +19,7 @@ import android.content.Context; import org.prebid.mobile.rendering.errors.AdException; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; public class PrebidWebViewInterstitial extends PrebidWebViewBase @@ -51,7 +51,7 @@ public void loadHTML(String html, int width, int height) { public void preloaded(WebViewBase adBaseView) { if (adBaseView == null) { //This should never happen. - OXLog.error(TAG, "Failed to preload an interstitial. Webview is null."); + LogUtil.error(TAG, "Failed to preload an interstitial. Webview is null."); if (mWebViewDelegate != null) { mWebViewDelegate.webViewFailedToLoad(new AdException(AdException.INTERNAL_ERROR, "Preloaded adview is null!")); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewBanner.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewBanner.java index eab4ce666..c2e2a2218 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewBanner.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewBanner.java @@ -22,7 +22,7 @@ import org.prebid.mobile.rendering.models.internal.MraidEvent; import org.prebid.mobile.rendering.utils.helpers.HandlerQueueManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.mraid.BannerJSInterface; import org.prebid.mobile.rendering.views.webview.mraid.BaseJSInterface; import org.prebid.mobile.rendering.views.webview.mraid.JsExecutor; @@ -64,7 +64,7 @@ public void setMRAIDInterface() { new HandlerQueueManager())); addJavascriptInterface(mraid, "jsBridge"); - OXLog.debug(TAG, "JS bridge initialized"); + LogUtil.debug(TAG, "JS bridge initialized"); setBaseJSInterface(mraid); } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewBase.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewBase.java index a1d04baaf..4af60d8a0 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewBase.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewBase.java @@ -29,7 +29,7 @@ import org.prebid.mobile.rendering.sdk.JSLibraryManager; import org.prebid.mobile.rendering.sdk.PrebidRenderingSettings; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.mraid.BaseJSInterface; import java.util.regex.Matcher; @@ -329,7 +329,7 @@ private String buildViewportMetaTag() { if (!TextUtils.isEmpty(scale)) { if (Utils.atLeastKitKat()) { - OXLog.debug(TAG, "Metatag is set correctly"); + LogUtil.debug(TAG, "Metatag is set correctly"); metaTag = new StringBuilder(""); meta = metaTag.toString(); @@ -341,7 +341,7 @@ private String buildViewportMetaTag() { } } else { - OXLog.debug(TAG, "Scale is null. Please check"); + LogUtil.debug(TAG, "Scale is null. Please check"); metaTag = new StringBuilder(""); meta = metaTag.toString(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewInterstitial.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewInterstitial.java index 686e38217..33e026a65 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewInterstitial.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/WebViewInterstitial.java @@ -21,7 +21,7 @@ import android.os.Looper; import org.prebid.mobile.rendering.utils.helpers.HandlerQueueManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.PreloadManager.PreloadedListener; import org.prebid.mobile.rendering.views.webview.mraid.BaseJSInterface; import org.prebid.mobile.rendering.views.webview.mraid.InterstitialJSInterface; @@ -51,7 +51,7 @@ public void setMRAIDInterface() { new HandlerQueueManager())); addJavascriptInterface(mraid, "jsBridge"); - OXLog.debug(TAG, "JS bridge initialized"); + LogUtil.debug(TAG, "JS bridge initialized"); setBaseJSInterface(mraid); } } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/BaseJSInterface.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/BaseJSInterface.java index 4d67ca789..0d9ce3f8e 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/BaseJSInterface.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/BaseJSInterface.java @@ -33,10 +33,6 @@ import android.view.ViewGroup.LayoutParams; import android.webkit.JavascriptInterface; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; - import org.json.JSONException; import org.json.JSONObject; import org.prebid.mobile.rendering.models.HTMLCreative; @@ -57,12 +53,16 @@ import org.prebid.mobile.rendering.utils.helpers.HandlerQueueManager; import org.prebid.mobile.rendering.utils.helpers.MraidUtils; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.PrebidWebViewBase; import org.prebid.mobile.rendering.views.webview.WebViewBase; import java.lang.ref.WeakReference; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + @SuppressLint("NewApi") public class BaseJSInterface implements JSInterface { private static final String TAG = BaseJSInterface.class.getSimpleName(); @@ -130,7 +130,7 @@ public String getMaxSize() { return maxSize.toString(); } catch (Exception e) { - OXLog.error(TAG, "Failed getMaxSize() for MRAID: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed getMaxSize() for MRAID: " + Log.getStackTraceString(e)); } return "{}"; @@ -147,7 +147,7 @@ public String getScreenSize() { return position.toString(); } catch (Exception e) { - OXLog.error(TAG, "Failed getScreenSize() for MRAID: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed getScreenSize() for MRAID: " + Log.getStackTraceString(e)); } return "{}"; @@ -166,7 +166,7 @@ public String getDefaultPosition() { return position.toString(); } catch (Exception e) { - OXLog.error(TAG, "Failed to get defaultPosition for MRAID: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to get defaultPosition for MRAID: " + Log.getStackTraceString(e)); } return "{}"; @@ -188,7 +188,7 @@ public String getCurrentPosition() { return position.toString(); } catch (Exception e) { - OXLog.error(TAG, "Failed to get currentPosition for MRAID: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "Failed to get currentPosition for MRAID: " + Log.getStackTraceString(e)); } return "{}"; } @@ -241,14 +241,14 @@ public void resize() { @Override @JavascriptInterface public void expand() { - OXLog.debug(TAG, "Expand with no url"); + LogUtil.debug(TAG, "Expand with no url"); expand(null); } @Override @JavascriptInterface public void expand(final String url) { - OXLog.debug(TAG, "Expand with url: " + url); + LogUtil.debug(TAG, "Expand with url: " + url); mMraidEvent.mraidAction = ACTION_EXPAND; mMraidEvent.mraidActionHelper = url; @@ -327,7 +327,7 @@ public void playVideo(String url) { @JavascriptInterface public void shouldUseCustomClose(String useCustomClose) { mJsExecutor.executeNativeCallComplete(); - OXLog.debug(TAG, "Deprecated: useCustomClose was deprecated in MRAID 3"); + LogUtil.debug(TAG, "Deprecated: useCustomClose was deprecated in MRAID 3"); } @Override @@ -347,7 +347,7 @@ public String getLocation() { return location.toString(); } catch (JSONException e) { - OXLog.error(TAG, "MRAID: Error providing location: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "MRAID: Error providing location: " + Log.getStackTraceString(e)); } } @@ -370,7 +370,7 @@ public String getCurrentAppOrientation() { return deviceOrientationJson.toString(); } catch (JSONException e) { - OXLog.error(TAG, "MRAID: Error providing deviceOrientationJson: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "MRAID: Error providing deviceOrientationJson: " + Log.getStackTraceString(e)); } return "{}"; @@ -379,14 +379,14 @@ public String getCurrentAppOrientation() { @Override @JavascriptInterface public void unload() { - OXLog.debug(TAG, "unload called"); + LogUtil.debug(TAG, "unload called"); mMraidEvent.mraidAction = ACTION_UNLOAD; notifyMraidEventHandler(); } public void onStateChange(String state) { if (state == null) { - OXLog.debug(TAG, "onStateChange failure. State is null"); + LogUtil.debug(TAG, "onStateChange failure. State is null"); return; } mOrientationBroadcastReceiver.setState(state); @@ -465,7 +465,7 @@ public void onReadyExpanded() { supports(MraidVariableContainer.getDisabledFlags()); updateScreenMetricsAsync(() -> { - OXLog.debug(TAG, "MRAID OnReadyExpanded Fired"); + LogUtil.debug(TAG, "MRAID OnReadyExpanded Fired"); mJsExecutor.executeStateChange(STATE_EXPANDED); mJsExecutor.executeOnReadyExpanded(); }); @@ -507,7 +507,7 @@ public void updateScreenMetricsAsync( mDefaultAdContainer = (PrebidWebViewBase) mAdBaseView.getPreloadedListener(); // Determine which web view should be used for the current ad position - OXLog.debug(TAG, "updateMetrics() Width: " + mAdBaseView.getWidth() + " Height: " + mAdBaseView.getHeight()); + LogUtil.debug(TAG, "updateMetrics() Width: " + mAdBaseView.getWidth() + " Height: " + mAdBaseView.getHeight()); // Wait for the next draw pass on the default ad container and current web view mScreenMetricsWaiter.queueMetricsRequest(() -> { diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/JsExecutor.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/JsExecutor.java index 3493ee4cc..464001423 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/JsExecutor.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/JsExecutor.java @@ -24,18 +24,18 @@ import android.util.Log; import android.webkit.WebView; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.models.internal.MraidVariableContainer; import org.prebid.mobile.rendering.utils.exposure.ViewExposure; import org.prebid.mobile.rendering.utils.helpers.HandlerQueueManager; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.WebViewBase; import java.lang.ref.WeakReference; import java.util.Locale; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + public class JsExecutor { private static final String TAG = JsExecutor.class.getSimpleName(); @@ -161,17 +161,17 @@ String getCurrentState() { @VisibleForTesting void evaluateJavaScript(final String script) { if (mWebView == null) { - OXLog.debug(TAG, "evaluateJavaScript failure. mWebView is null"); + LogUtil.debug(TAG, "evaluateJavaScript failure. mWebView is null"); return; } - OXLog.debug(TAG, "evaluateJavaScript: " + script); + LogUtil.debug(TAG, "evaluateJavaScript: " + script); try { String scriptToEvaluate = "javascript: if (window.mraid && (window.mraid.getState() != 'loading' ) && ( window.mraid.getState() != 'hidden') ) { " + script + " }"; mScriptExecutionHandler.post(new EvaluateScriptRunnable(mWebView, scriptToEvaluate)); } catch (Exception e) { - OXLog.error(TAG, "evaluateJavaScript failed for script " + script + Log.getStackTraceString(e)); + LogUtil.error(TAG, "evaluateJavaScript failed for script " + script + Log.getStackTraceString(e)); } } @@ -199,7 +199,7 @@ else if (handler != null) { @VisibleForTesting void evaluateMraidScript(final String script) { if (mWebView == null) { - OXLog.debug(TAG, "evaluateMraidScript failure. mWebView is null"); + LogUtil.debug(TAG, "evaluateMraidScript failure. mWebView is null"); return; } @@ -208,7 +208,7 @@ void evaluateMraidScript(final String script) { mScriptExecutionHandler.post(new EvaluateScriptRunnable(mWebView, scriptToEvaluate)); } catch (Exception e) { - OXLog.error(TAG, "evaluateMraidScript failed: " + Log.getStackTraceString(e)); + LogUtil.error(TAG, "evaluateMraidScript failed: " + Log.getStackTraceString(e)); } } @@ -228,7 +228,7 @@ static class EvaluateScriptRunnable implements Runnable { public void run() { WebView webView = mWeakAdView.get(); if (webView == null) { - OXLog.error(TAG, "Failed to evaluate script. WebView is null"); + LogUtil.error(TAG, "Failed to evaluate script. WebView is null"); return; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/MraidWebViewClient.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/MraidWebViewClient.java index 632ddcdf5..19e8e3501 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/MraidWebViewClient.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/MraidWebViewClient.java @@ -20,17 +20,17 @@ import android.webkit.WebResourceResponse; import android.webkit.WebView; -import androidx.annotation.VisibleForTesting; - import org.prebid.mobile.rendering.mraid.MraidEnv; import org.prebid.mobile.rendering.utils.helpers.Utils; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.AdWebViewClient; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.Locale; +import androidx.annotation.VisibleForTesting; + /** * Handles injecting the MRAID javascript to the 2nd webview, when encountering mraid.js urls */ @@ -69,7 +69,7 @@ private WebResourceResponse createMraidInjectionResponse() { return new WebResourceResponse("text/javascript", "UTF-8", data); } else { - OXLog.error(TAG, "Failed to inject mraid.js into twoPart mraid webview"); + LogUtil.error(TAG, "Failed to inject mraid.js into twoPart mraid webview"); } return null; } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/OriginalUrlResponseCallBack.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/OriginalUrlResponseCallBack.java index a98f7e1b8..ab908c2a0 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/OriginalUrlResponseCallBack.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/OriginalUrlResponseCallBack.java @@ -19,7 +19,7 @@ import org.prebid.mobile.rendering.mraid.methods.network.RedirectUrlListener; import org.prebid.mobile.rendering.networking.BaseNetworkTask; import org.prebid.mobile.rendering.networking.ResponseHandler; -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; class OriginalUrlResponseCallBack implements ResponseHandler { private static final String TAG = OriginalUrlResponseCallBack.class.getSimpleName(); @@ -33,7 +33,7 @@ class OriginalUrlResponseCallBack implements ResponseHandler { @Override public void onResponse(BaseNetworkTask.GetUrlResult result) { if (result == null) { - OXLog.error(TAG, "getOriginalURLCallback onResponse failed. Result is null"); + LogUtil.error(TAG, "getOriginalURLCallback onResponse failed. Result is null"); notifyFailureListener(); return; } @@ -45,13 +45,13 @@ public void onResponse(BaseNetworkTask.GetUrlResult result) { @Override public void onError(String msg, long responseTime) { - OXLog.error(TAG, "Failed with " + msg); + LogUtil.error(TAG, "Failed with " + msg); notifyFailureListener(); } @Override public void onErrorWithException(Exception e, long responseTime) { - OXLog.error(TAG, "Failed with " + e.getMessage()); + LogUtil.error(TAG, "Failed with " + e.getMessage()); notifyFailureListener(); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/ScreenMetricsWaiter.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/ScreenMetricsWaiter.java index 87fe37eee..7438c521d 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/ScreenMetricsWaiter.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/ScreenMetricsWaiter.java @@ -21,14 +21,14 @@ import android.view.View; import android.view.ViewTreeObserver; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import org.prebid.mobile.rendering.utils.logger.OXLog; +import org.prebid.mobile.rendering.utils.logger.LogUtil; import org.prebid.mobile.rendering.views.webview.PrebidWebViewBase; import java.util.LinkedList; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public class ScreenMetricsWaiter { private final static String TAG = ScreenMetricsWaiter.class.getSimpleName(); @@ -48,13 +48,13 @@ void queueMetricsRequest( newWaitRequest.start(); } mWaitRequestQueue.addLast(newWaitRequest); - OXLog.debug(TAG, "New request queued. Queue size: " + mWaitRequestQueue.size()); + LogUtil.debug(TAG, "New request queued. Queue size: " + mWaitRequestQueue.size()); } void finishAndStartNextRequest() { mWaitRequestQueue.removeFirst(); WaitRequest firstInQueueRequest = mWaitRequestQueue.peekFirst(); - OXLog.debug(TAG, "Request finished. Queue size: " + mWaitRequestQueue.size()); + LogUtil.debug(TAG, "Request finished. Queue size: " + mWaitRequestQueue.size()); if (firstInQueueRequest != null) { firstInQueueRequest.start(); } @@ -114,7 +114,7 @@ public void run() { // Immediately count down for any views that already have a size if (view.getHeight() > 0 || view.getWidth() > 0 || mIsAnswerRequired || isTwoPart) { countDown(); - OXLog.debug(TAG, "Get known metrics for: " + view.getClass().getSimpleName() + ", h: " + view.getHeight() + ", w: " + view.getWidth()); + LogUtil.debug(TAG, "Get known metrics for: " + view.getClass().getSimpleName() + ", h: " + view.getHeight() + ", w: " + view.getWidth()); continue; } @@ -122,11 +122,11 @@ public void run() { // that this doesn't leak because the ViewTreeObserver gets detached when // the view is no longer part of the view hierarchy. - OXLog.debug(TAG, "Create listener for: " + view.getClass().getSimpleName()); + LogUtil.debug(TAG, "Create listener for: " + view.getClass().getSimpleName()); view.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() { @Override public boolean onPreDraw() { - OXLog.debug(TAG, "Get metrics from listener for: " + view.getClass().getSimpleName() + ", h: " + view.getHeight() + ", w: " + view.getWidth()); + LogUtil.debug(TAG, "Get metrics from listener for: " + view.getClass().getSimpleName() + ", h: " + view.getHeight() + ", w: " + view.getWidth()); view.getViewTreeObserver().removeOnPreDrawListener(this); countDown(); return true; diff --git a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/Views.java b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/Views.java index e44ca90b2..c82166a94 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/Views.java +++ b/PrebidMobile/PrebidMobile-rendering/src/main/java/org/prebid/mobile/rendering/views/webview/mraid/Views.java @@ -21,11 +21,11 @@ import android.view.View; import android.view.ViewGroup; +import org.prebid.mobile.rendering.utils.logger.LogUtil; + import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; -import org.prebid.mobile.rendering.utils.logger.OXLog; - public class Views { public static final String TAG = Views.class.getSimpleName(); @@ -80,7 +80,7 @@ private static View getRootViewFromView(@Nullable final View view) { } if (!ViewCompat.isAttachedToWindow(view)) { - OXLog.debug(TAG, "Attempting to call View.getRootView() on an unattached View."); + LogUtil.debug(TAG, "Attempting to call View.getRootView() on an unattached View."); } final View rootView = view.getRootView(); diff --git a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/config/OXBAdUnitConfigurationTest.java b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/config/AdUnitConfigurationTest.java similarity index 99% rename from PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/config/OXBAdUnitConfigurationTest.java rename to PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/config/AdUnitConfigurationTest.java index 5e38003c7..17905e46d 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/config/OXBAdUnitConfigurationTest.java +++ b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/config/AdUnitConfigurationTest.java @@ -33,7 +33,7 @@ @RunWith(RobolectricTestRunner.class) @Config(sdk = 19) -public class OXBAdUnitConfigurationTest { +public class AdUnitConfigurationTest { private AdConfiguration mAdUnitConfig; diff --git a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BannerViewTest.java b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BannerViewTest.java index 6aca162ff..4313147e5 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BannerViewTest.java +++ b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BannerViewTest.java @@ -105,7 +105,7 @@ public void setup() throws Exception { } @Test - public void createOXBBannerViewWithAttributes_InstanceCreated() { + public void createPrebidBannerViewWithAttributes_InstanceCreated() { AttributeSet attributes = Robolectric.buildAttributeSet().build(); BannerView bannerView = new BannerView(mMockContext, attributes); @@ -113,7 +113,7 @@ public void createOXBBannerViewWithAttributes_InstanceCreated() { } @Test - public void createOXBBannerViewNoEventHandler_InstanceCreatedAndBidLoaderIsNotNullAndStandaloneEventHandlerProvided() + public void createPrebidBannerViewNoEventHandler_InstanceCreatedAndBidLoaderIsNotNullAndStandaloneEventHandlerProvided() throws IllegalAccessException { BannerView bannerView = new BannerView(mMockContext, AD_UNIT_ID, AD_SIZE); @@ -274,19 +274,19 @@ public void onError_NullifyWinnerBidAndRequestAdWitNullBid() { //region ================= BannerEventListener tests @Test - public void onOxbSdkWinAndWinnerBidIsNull_AdRequestStatusIsFinishedNotifyErrorListener() { + public void onPrebidSdkWinAndWinnerBidIsNull_AdRequestStatusIsFinishedNotifyErrorListener() { changePrimaryAdServerRequestStatus(true); final BannerEventListener bannerEventListener = getBannerEventListener(); mBannerView.setBidResponse(null); - bannerEventListener.onOXBSdkWin(); + bannerEventListener.onPrebidSdkWin(); verify(mMockBannerListener, times(1)).onAdFailed(eq(mBannerView), any(AdException.class)); assertFalse(mBannerView.isPrimaryAdServerRequestInProgress()); } @Test - public void onOxbSdkWin_AdRequestStatusIsFinishedDisplayAdView() { + public void onPrebidSdkWin_AdRequestStatusIsFinishedDisplayAdView() { changePrimaryAdServerRequestStatus(true); final BannerEventListener bannerEventListener = getBannerEventListener(); final BidResponse mockBidResponse = mock(BidResponse.class); @@ -297,7 +297,7 @@ public void onOxbSdkWin_AdRequestStatusIsFinishedDisplayAdView() { mBannerView.setBidResponse(mockBidResponse); - bannerEventListener.onOXBSdkWin(); + bannerEventListener.onPrebidSdkWin(); assertFalse(mBannerView.isPrimaryAdServerRequestInProgress()); } @@ -307,7 +307,6 @@ public void onAdServerWin_AdRequestStatusIsFinishedDisplayAdViewAndNotifyAdRecei changePrimaryAdServerRequestStatus(true); final View mockView = mock(View.class); - // final OXBBannerView spyBannerView = spy(mOXBBannerView); final BannerEventListener bannerEventListener = getBannerEventListener(); bannerEventListener.onAdServerWin(mockView); @@ -331,7 +330,7 @@ public void onFailedAndNoWinnerBid_AdRequestStatusIsFinishedNotifyErrorListener( } @Test - public void onFailedAndWithWinnerBid_AdRequestStatusIsFinishedNotifyOxbSdkWin() { + public void onFailedAndWithWinnerBid_AdRequestStatusIsFinishedNotifyPrebidSdkWin() { changePrimaryAdServerRequestStatus(true); final BidResponse mockBidResponse = mock(BidResponse.class); @@ -344,7 +343,7 @@ public void onFailedAndWithWinnerBid_AdRequestStatusIsFinishedNotifyOxbSdkWin() spyEventListener.onAdFailed(new AdException(AdException.INTERNAL_ERROR, "Test")); assertFalse(mBannerView.isPrimaryAdServerRequestInProgress()); - verify(spyEventListener, times(1)).onOXBSdkWin(); + verify(spyEventListener, times(1)).onPrebidSdkWin(); } @Test diff --git a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnitTest.java b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnitTest.java index 5cae04a6e..f6cd23af1 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnitTest.java +++ b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnitTest.java @@ -55,10 +55,10 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.LOADING; -import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.OXB_LOADING; +import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.PREBID_LOADING; import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_FOR_LOAD; import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_GAM; -import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_OXB; +import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_PREBID; @RunWith(RobolectricTestRunner.class) public class InterstitialAdUnitTest { @@ -118,7 +118,7 @@ public void loadAdWithInvalidInterstitialAdState_DoNothing() { mInterstitialAdUnit.loadAd(); verifyZeroInteractions(mMockBidLoader); - changeInterstitialState(BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_OXB); + changeInterstitialState(BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_PREBID); mInterstitialAdUnit.loadAd(); verifyZeroInteractions(mMockBidLoader); @@ -126,7 +126,7 @@ public void loadAdWithInvalidInterstitialAdState_DoNothing() { mInterstitialAdUnit.loadAd(); verifyZeroInteractions(mMockBidLoader); - changeInterstitialState(BaseInterstitialAdUnit.InterstitialAdUnitState.OXB_LOADING); + changeInterstitialState(BaseInterstitialAdUnit.InterstitialAdUnitState.PREBID_LOADING); mInterstitialAdUnit.loadAd(); verifyZeroInteractions(mMockBidLoader); } @@ -155,10 +155,10 @@ public void showWhenAuctionWinnerIsGAM_ShowGam() { } @Test - public void showWhenAuctionWinnerIsOXB_ShowOXB() { + public void showWhenAuctionWinnerIsPrebid_ShowPrebid() { final InterstitialController mockInterstitialController = mock(InterstitialController.class); - changeInterstitialState(READY_TO_DISPLAY_OXB); + changeInterstitialState(READY_TO_DISPLAY_PREBID); WhiteBox.setInternalState(mInterstitialAdUnit, "mInterstitialController", mockInterstitialController); mInterstitialAdUnit.show(); @@ -174,13 +174,13 @@ public void isLoadedWhenAuctionIsNotReadyForDisplay_ReturnFalse() { changeInterstitialState(LOADING); assertFalse(mInterstitialAdUnit.isLoaded()); - changeInterstitialState(OXB_LOADING); + changeInterstitialState(PREBID_LOADING); assertFalse(mInterstitialAdUnit.isLoaded()); } @Test public void isLoadedWhenAuctionIsReadyForDisplay_ReturnTrue() { - changeInterstitialState(READY_TO_DISPLAY_OXB); + changeInterstitialState(READY_TO_DISPLAY_PREBID); assertTrue(mInterstitialAdUnit.isLoaded()); changeInterstitialState(READY_TO_DISPLAY_GAM); @@ -222,10 +222,10 @@ public void onError_RequestAdWitNullBid() { //region ================= EventListener tests @Test - public void onOxbSdkWinAndWinnerBidIsNull_AdStatusReadyForLoadNotifyErrorListener() { + public void onPrebidSdkWinAndWinnerBidIsNull_AdStatusReadyForLoadNotifyErrorListener() { final InterstitialEventListener eventListener = getEventListener(); - eventListener.onOXBSdkWin(); + eventListener.onPrebidSdkWin(); verify(mMockInterstitialAdUnitListener, times(1)).onAdFailed(eq(mInterstitialAdUnit), any(AdException.class)); assertEquals(READY_FOR_LOAD, mInterstitialAdUnit.getAdUnitState()); @@ -265,7 +265,7 @@ public void onFailedAndWithWinnerBid_ExecuteInterstitialControllerLoadAd() { spyEventListener.onAdFailed(new AdException(AdException.INTERNAL_ERROR, "Test")); - verify(spyEventListener, times(1)).onOXBSdkWin(); + verify(spyEventListener, times(1)).onPrebidSdkWin(); verify(mockInterstitialController, times(1)).loadAd(any(), any()); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnitTest.java b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnitTest.java index 43d85a48e..53518dd8b 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnitTest.java +++ b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnitTest.java @@ -53,10 +53,10 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.LOADING; -import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.OXB_LOADING; +import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.PREBID_LOADING; import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_FOR_LOAD; import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_GAM; -import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_OXB; +import static org.prebid.mobile.rendering.bidding.parallel.BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_PREBID; @RunWith(RobolectricTestRunner.class) public class RewardedAdUnitTest { @@ -116,7 +116,7 @@ public void loadAdWithInvalidInterstitialAdState_DoNothing() { mRewardedAdUnit.loadAd(); verifyZeroInteractions(mMockBidLoader); - changeInterstitialState(BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_OXB); + changeInterstitialState(BaseInterstitialAdUnit.InterstitialAdUnitState.READY_TO_DISPLAY_PREBID); mRewardedAdUnit.loadAd(); verifyZeroInteractions(mMockBidLoader); @@ -124,7 +124,7 @@ public void loadAdWithInvalidInterstitialAdState_DoNothing() { mRewardedAdUnit.loadAd(); verifyZeroInteractions(mMockBidLoader); - changeInterstitialState(BaseInterstitialAdUnit.InterstitialAdUnitState.OXB_LOADING); + changeInterstitialState(BaseInterstitialAdUnit.InterstitialAdUnitState.PREBID_LOADING); mRewardedAdUnit.loadAd(); verifyZeroInteractions(mMockBidLoader); } @@ -153,10 +153,10 @@ public void showWhenAuctionWinnerIsGAM_ShowGam() { } @Test - public void showWhenAuctionWinnerIsOXB_ShowOXB() { + public void showWhenAuctionWinnerIsPrebid_ShowPrebid() { final InterstitialController mockInterstitialController = mock(InterstitialController.class); - changeInterstitialState(READY_TO_DISPLAY_OXB); + changeInterstitialState(READY_TO_DISPLAY_PREBID); WhiteBox.setInternalState(mRewardedAdUnit, "mInterstitialController", mockInterstitialController); mRewardedAdUnit.show(); @@ -172,13 +172,13 @@ public void isLoadedWhenAuctionIsNotReadyForDisplay_ReturnFalse() { changeInterstitialState(LOADING); assertFalse(mRewardedAdUnit.isLoaded()); - changeInterstitialState(OXB_LOADING); + changeInterstitialState(PREBID_LOADING); assertFalse(mRewardedAdUnit.isLoaded()); } @Test public void isLoadedWhenAuctionIsReadyForDisplay_ReturnTrue() { - changeInterstitialState(READY_TO_DISPLAY_OXB); + changeInterstitialState(READY_TO_DISPLAY_PREBID); assertTrue(mRewardedAdUnit.isLoaded()); changeInterstitialState(READY_TO_DISPLAY_GAM); @@ -220,10 +220,10 @@ public void onError_RequestAdWitNullBid() { //region ================= EventListener tests @Test - public void onOxbSdkWinAndWinnerBidIsNull_AdStatusReadyForLoadNotifyErrorListener() { + public void onPrebidSdkWinAndWinnerBidIsNull_AdStatusReadyForLoadNotifyErrorListener() { final RewardedVideoEventListener eventListener = getEventListener(); - eventListener.onOXBSdkWin(); + eventListener.onPrebidSdkWin(); verify(mMockRewardedAdUnitListener, times(1)).onAdFailed(eq(mRewardedAdUnit), any(AdException.class)); assertEquals(READY_FOR_LOAD, mRewardedAdUnit.getAdUnitState()); @@ -264,7 +264,7 @@ public void onFailedAndWithWinnerBid_ExecuteInterstitialControllerLoadAd() spyEventListener.onAdFailed(new AdException(AdException.INTERNAL_ERROR, "Test")); - verify(spyEventListener, times(1)).onOXBSdkWin(); + verify(spyEventListener, times(1)).onPrebidSdkWin(); verify(mockInterstitialController, times(1)).loadAd(any(), any()); } diff --git a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/models/HTMLCreativeTest.java b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/models/HTMLCreativeTest.java index df5795409..573d9e582 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/models/HTMLCreativeTest.java +++ b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/models/HTMLCreativeTest.java @@ -367,10 +367,10 @@ public void destroyTest() { @Test public void createOmAdSessionTest() throws IllegalAccessException { - PrebidWebViewBase mockOXWebView = mock(PrebidWebViewBase.class); - when(mockOXWebView.getWebView()).thenReturn(mock(WebViewBase.class)); + PrebidWebViewBase mockWebView = mock(PrebidWebViewBase.class); + when(mockWebView.getWebView()).thenReturn(mock(WebViewBase.class)); - mHtmlCreative.setCreativeView(mockOXWebView); + mHtmlCreative.setCreativeView(mockWebView); mHtmlCreative.createOmAdSession(); verify(mMockOmAdSessionManager).initWebAdSessionManager(any(WebViewBase.class), any()); diff --git a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/mraid/methods/MraidControllerTest.java b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/mraid/methods/MraidControllerTest.java index 1d2528693..01ddee13c 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/mraid/methods/MraidControllerTest.java +++ b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/mraid/methods/MraidControllerTest.java @@ -241,19 +241,19 @@ public void delegateDisplayViewInInterstitialAndExpandNotNull_SetExpandDisplayVi WebViewBase mockWebView = mock(WebViewBase.class); MraidEvent mockEvent = mock(MraidEvent.class); MraidExpand mockMraidExpand = mock(MraidExpand.class); - PrebidWebViewBase mockOxBase = mock(PrebidWebViewBase.class); + PrebidWebViewBase mockWebViewBase = mock(PrebidWebViewBase.class); mockEvent.mraidAction = JSInterface.ACTION_EXPAND; mockEvent.mraidActionHelper = "test"; when(mockMraidExpand.getInterstitialViewController()).thenReturn(mock(AdBaseDialog.class)); - when(mockWebView.getPreloadedListener()).thenReturn(mockOxBase); + when(mockWebView.getPreloadedListener()).thenReturn(mockWebViewBase); WhiteBox.field(MraidController.class, "mMraidExpand").set(mMraidController, mockMraidExpand); getMraidDelegate().displayPrebidWebViewForMraid(mockWebView, true, mockEvent); verify(mockMraidExpand, times(1)).setDisplayView(mockWebView); - verify(mockOxBase).initMraidExpanded(); + verify(mockWebViewBase).initMraidExpanded(); } @Test diff --git a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/networking/parameters/BasicParameterBuilderTest.java b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/networking/parameters/BasicParameterBuilderTest.java index d95b71976..3b0fffcda 100755 --- a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/networking/parameters/BasicParameterBuilderTest.java +++ b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/networking/parameters/BasicParameterBuilderTest.java @@ -276,7 +276,7 @@ public void whenAppendParametersAndTargetingParamsWereSet_TargetingParamsWereApp Targeting.setUserAge(USER_AGE); Targeting.setUserKeywords(USER_KEYWORDS); Targeting.setUserCustomData(USER_CUSTOM); - Targeting.setUserGender(UserParameters.OXMGender.MALE); + Targeting.setUserGender(UserParameters.Gender.MALE); Targeting.setBuyerUid(USER_BUYER_ID); Targeting.setUserExt(new Ext()); Targeting.setEids(new JSONArray()); diff --git a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/networking/targeting/TargetingTest.java b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/networking/targeting/TargetingTest.java index d93527fd8..8eebd7545 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/networking/targeting/TargetingTest.java +++ b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/networking/targeting/TargetingTest.java @@ -65,7 +65,7 @@ public void setUserCustomData_EqualToGetUserCustomData() { public void setUserGender_EqualToGetUserGenderAndIsInRequestParams() { final String expected = UserParameters.GENDER_FEMALE; - Targeting.setUserGender(UserParameters.OXMGender.FEMALE); + Targeting.setUserGender(UserParameters.Gender.FEMALE); assertEquals(expected, Targeting.getUserGender()); assertEquals(expected, Targeting.getTargetingMap().get(Targeting.KEY_GENDER)); diff --git a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/sdk/deviceData/managers/NetworkConnectionInfoManagerTest.java b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/sdk/deviceData/managers/NetworkConnectionInfoManagerTest.java index 8568b9233..7f0c47082 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/sdk/deviceData/managers/NetworkConnectionInfoManagerTest.java +++ b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/sdk/deviceData/managers/NetworkConnectionInfoManagerTest.java @@ -61,6 +61,6 @@ public void getConnectionTypeTest() { when(mockInfo.getType()).thenReturn(ConnectivityManager.TYPE_MOBILE); when(mConnectivityManager.getActiveNetworkInfo()).thenReturn(mockInfo); - assertEquals(UserParameters.OXMConnectionType.CELL, mNetworkConnectionManager.getConnectionType()); + assertEquals(UserParameters.ConnectionType.CELL, mNetworkConnectionManager.getConnectionType()); } } \ No newline at end of file diff --git a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/views/webview/mraid/BaseJSInterfaceTest.java b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/views/webview/mraid/BaseJSInterfaceTest.java index 6aa799177..24b2bbe30 100644 --- a/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/views/webview/mraid/BaseJSInterfaceTest.java +++ b/PrebidMobile/PrebidMobile-rendering/src/test/java/org/prebid/mobile/rendering/views/webview/mraid/BaseJSInterfaceTest.java @@ -417,8 +417,8 @@ public void getOriginalURLCallBackTest() throws IllegalAccessException { RedirectUrlListener mockListener = mock(RedirectUrlListener.class); mSpyBaseJSInterface.followToOriginalUrl("test", mockListener); - GetOriginalUrlTask oxmRedirectedUrlAsyncTask = WhiteBox.getInternalState(mSpyBaseJSInterface, "mRedirectedUrlAsyncTask"); - ResponseHandler getOriginalURLCallBack = WhiteBox.getInternalState(oxmRedirectedUrlAsyncTask, "mResponseHandler"); + GetOriginalUrlTask redirectedUrlAsyncTask = WhiteBox.getInternalState(mSpyBaseJSInterface, "mRedirectedUrlAsyncTask"); + ResponseHandler getOriginalURLCallBack = WhiteBox.getInternalState(redirectedUrlAsyncTask, "mResponseHandler"); getOriginalURLCallBack.onResponse(mock(BaseNetworkTask.GetUrlResult.class)); verify(mockListener).onSuccess(any(), any());