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
*/
-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());