NetworkOnMainThreadException Fix

Example/PrebidDemoJava/build.gradle

@@ -38,7 +38,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     // Ads
-    implementation 'com.google.android.gms:play-services-ads:+'
+    implementation libs.google.play.services.ads
 
     // Video Player
     implementation 'com.google.android.exoplayer:exoplayer:2.15.1'

Example/PrebidDemoKotlin/build.gradle

@@ -46,7 +46,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
 
     // Advertisement
-    implementation 'com.google.android.gms:play-services-ads:+'
+    implementation libs.google.play.services.ads
     implementation "com.applovin:applovin-sdk:11.5.3"
     implementation "com.google.android.gms:play-services-ads-identifier:18.0.1" // For Applovin Max
 

Example/PrebidInternalTestApp/build.gradle

@@ -84,7 +84,7 @@ dependencies {
 
     // Ad dependencies
     implementation 'com.google.android.gms:play-services-base:18.1.0'
-    implementation 'com.google.android.gms:play-services-ads:+'
+    implementation libs.google.play.services.ads
     implementation "com.applovin:applovin-sdk:11.3.2"
     implementation "com.google.android.gms:play-services-ads-identifier:18.0.1" // For Applovin Max
 

PrebidMobile/PrebidMobile-admobAdapters/build.gradle

@@ -10,5 +10,5 @@ android {
 
 dependencies {
     implementation project(":PrebidMobile")
-    implementation 'com.google.android.gms:play-services-ads:+'
+    implementation libs.google.play.services.ads
 }

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java

@@ -403,6 +403,11 @@ public void setGpid(@Nullable String gpid) {
         configuration.setGpid(gpid);
     }
 
+    @Nullable
+    public String getOrtbConfig() { return configuration.getOrtbConfig();}
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {configuration.setOrtbConfig(ortbConfig);}
+
     protected BidRequesterListener createBidListener(OnCompleteListener originalListener) {
         return new BidRequesterListener() {
             @Override

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/BannerAdUnit.java

@@ -17,6 +17,7 @@
 package org.prebid.mobile;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.prebid.mobile.api.data.AdFormat;
 import org.prebid.mobile.api.data.AdUnitFormat;
@@ -52,4 +53,13 @@ HashSet<AdSize> getSizes() {
         return configuration.getSizes();
     }
 
+    @Nullable
+    public String getOrtbConfig() {
+        return configuration.getOrtbConfig();
+    }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {
+        configuration.setOrtbConfig(ortbConfig);
+    }
+
 }

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/BannerBaseAdUnit.java

@@ -79,6 +79,15 @@ public Parameters getParameters() {
         return null;
     }
 
+    @Nullable
+    public String getOrtbConfig() {
+        return configuration.getOrtbConfig();
+    }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {
+        configuration.setOrtbConfig(ortbConfig);
+    }
+
     /**
      * Describes an <a href="https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf">OpenRTB</a> banner object
      */

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/InStreamVideoAdUnit.java

@@ -17,6 +17,7 @@
 package org.prebid.mobile;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.prebid.mobile.api.data.AdFormat;
 

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/InterstitialAdUnit.java

@@ -18,6 +18,7 @@
 
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.prebid.mobile.api.data.AdFormat;
 import org.prebid.mobile.api.data.AdUnitFormat;
@@ -59,4 +60,13 @@ public void setMinSizePercentage(
         configuration.setMinSizePercentage(new AdSize(width, height));
     }
 
+    @Nullable
+    public String getOrtbConfig() {
+        return configuration.getOrtbConfig();
+    }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {
+        configuration.setOrtbConfig(ortbConfig);
+    }
+
 }

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/NativeAdUnit.java

@@ -1,6 +1,7 @@
 package org.prebid.mobile;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import org.json.JSONObject;
@@ -212,4 +213,10 @@ public NativeAdUnitConfiguration getNativeConfiguration() {
         return nativeConfiguration;
     }
 
+    @Nullable
+    public String getOrtbConfig() {return configuration.getOrtbConfig();}
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {configuration.setOrtbConfig(ortbConfig);}
+
+
 }

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/VideoBaseAdUnit.java

@@ -39,6 +39,11 @@ public void setVideoParameters(@Nullable VideoParameters parameters) {
         configuration.setVideoParameters(parameters);
     }
 
+    @Nullable
+    public String getOrtbConfig() { return configuration.getOrtbConfig(); }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) { configuration.setOrtbConfig(ortbConfig);}
+
     /**
      * @deprecated use `setVideoParameters()`
      */

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/mediation/MediationBaseAdUnit.java

@@ -318,4 +318,13 @@ private void cancelRefresh() {
         }
     }
 
+    @Nullable
+    public String getOrtbConfig() {
+        return adUnitConfig.getOrtbConfig();
+    }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {
+        adUnitConfig.setOrtbConfig(ortbConfig);
+    }
+
 }

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/BannerView.java

@@ -684,6 +684,15 @@ public BidResponse getBidResponse() {
         return bidResponse;
     }
 
+    @Nullable
+    public String getOrtbConfig() {
+        return adUnitConfig.getOrtbConfig();
+    }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {
+        adUnitConfig.setOrtbConfig(ortbConfig);
+    }
+
     //region ==================== HelperMethods for Unit Tests. Should be used only in tests
     @VisibleForTesting
     final void setBidResponse(BidResponse response) {

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/BaseInterstitialAdUnit.java

@@ -278,6 +278,15 @@ public void clearUserData() {
         adUnitConfig.clearUserData();
     }
 
+    @Nullable
+    public String getOrtbConfig() {
+        return adUnitConfig.getOrtbConfig();
+    }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {
+        adUnitConfig.setOrtbConfig(ortbConfig);
+    }
+
 
     @Nullable
     public String getPbAdSlot() {

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/DisplayView.java

@@ -21,6 +21,7 @@
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.prebid.mobile.rendering.bidding.listeners.DisplayVideoListener;
 import org.prebid.mobile.api.rendering.pluginrenderer.PrebidMobilePluginRegister;
@@ -86,4 +87,13 @@ public void destroy() {
         displayViewListener = null;
         displayVideoListener = null;
     }
+
+    @Nullable
+    public String getOrtbConfig() {
+        return adUnitConfiguration.getOrtbConfig();
+    }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {
+        adUnitConfiguration.setOrtbConfig(ortbConfig);
+    }
 }

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/api/rendering/PrebidDisplayView.java

@@ -327,4 +327,13 @@ private static BidResponse getBidResponseFromCache(String id) throws AdException
         return cachedResponse;
     }
 
+    @Nullable
+    public String getOrtbConfig() {
+        return adUnitConfiguration.getOrtbConfig();
+    }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {
+        adUnitConfiguration.setOrtbConfig(ortbConfig);
+    }
+
 }

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/configuration/AdUnitConfiguration.java

@@ -57,6 +57,8 @@ public class AdUnitConfiguration {
     private String fingerprint = Utils.generateUUIDTimeBased();
     @Nullable
     private String gpid;
+    @Nullable
+    private String ortbConfig;
 
     private Position closeButtonPosition = Position.TOP_RIGHT;
     private Position skipButtonPosition = Position.TOP_RIGHT;
@@ -540,6 +542,15 @@ public void setGpid(@Nullable String gpid) {
         this.gpid = gpid;
     }
 
+    @Nullable
+    public String getOrtbConfig() {
+        return ortbConfig;
+    }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {
+        this.ortbConfig = ortbConfig;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/openrtb/BidRequest.java

@@ -18,15 +18,18 @@
 
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.prebid.mobile.LogUtil;
 import org.prebid.mobile.PrebidMobile;
 import org.prebid.mobile.rendering.models.openrtb.bidRequests.*;
 import org.prebid.mobile.rendering.models.openrtb.bidRequests.source.Source;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 
 public class BidRequest extends BaseBid {
 
@@ -37,12 +40,17 @@ public class BidRequest extends BaseBid {
     private Regs regs = null;
     private User user = null;
     private Source source = null;
-
+    @Nullable
+    private JSONObject arbitraryJSONConfig;
+    @Nullable
+    private String ortbConfig;
     private Ext ext = null;
 
     public JSONObject getJsonObject() throws JSONException {
         JSONObject jsonObject = new JSONObject();
-
+        if (arbitraryJSONConfig != null) {
+            deepMerge(arbitraryJSONConfig, jsonObject);
+        }
         if (imps != null && imps.size() > 0) {
 
             JSONArray jsonArray = new JSONArray();
@@ -62,10 +70,71 @@ public JSONObject getJsonObject() throws JSONException {
         toJSON(jsonObject, "source", source != null ? source.getJsonObject() : null);
         toJSON(jsonObject, "ext", ext != null ? ext.getJsonObject() : null);
         toJSON(jsonObject, "test", PrebidMobile.getPbsDebug() ? 1 : null);
-
+        jsonObject = mergeOrtbConfig(jsonObject);
         return jsonObject;
     }
 
+    private JSONObject mergeOrtbConfig(JSONObject bidRequestJson) {
+        try {
+            if (ortbConfig == null) {
+                return bidRequestJson;
+            }
+            JSONObject ortbConfigObject = new JSONObject(ortbConfig);
+            //remove protected fields
+            if (ortbConfigObject.has("regs")) {
+                ortbConfigObject.remove("regs");
+            }
+            if (ortbConfigObject.has("device")) {
+                ortbConfigObject.remove("device");
+            }
+            if (ortbConfigObject.has("geo")) {
+                ortbConfigObject.remove("geo");
+            }
+            if (ortbConfigObject.has("ext")) {
+                if (ortbConfigObject.get("ext") instanceof JSONObject) {
+                    ortbConfigObject.getJSONObject("ext").remove("gdpr");
+                    ortbConfigObject.getJSONObject("ext").remove("us_privacy");
+                    ortbConfigObject.getJSONObject("ext").remove("consent");
+                }
+            }
+            return deepMerge(ortbConfigObject, bidRequestJson);
+        } catch(Exception e) {
+            LogUtil.error("ORTBConfig is not valid JSON");
+            return bidRequestJson;
+        }
+    }
+
+    /**
+     * Merge "source" into "target". If fields have equal name, merge them recursively.
+     * @return the merged object (target).
+     */
+    private static JSONObject deepMerge(JSONObject source, JSONObject target) throws JSONException {
+        for (Iterator<String> it = source.keys(); it.hasNext(); ) {
+            String key = it.next();
+            Object value = source.get(key);
+            if (!target.has(key)) {
+                // new value for "key":
+                target.put(key, value);
+            } else {
+                // existing value for "key" - recursively deep merge:
+                if (value instanceof JSONObject) {
+                    JSONObject valueJson = (JSONObject) value;
+                    deepMerge(valueJson, target.getJSONObject(key));
+                } else if (value instanceof JSONArray) {
+                    if (target.get(key) instanceof JSONArray) {
+                        JSONArray sourceArray = (JSONArray) value;
+                        for (int i = 0; i < sourceArray.length(); i++) {
+                            target.getJSONArray(key).put(sourceArray.getJSONObject(i));
+                        }
+                    }
+                } else {
+                    target.put(key, value);
+                }
+            }
+        }
+        return target;
+    }
+
     // Accessors to prevent NPE while maintaining null if object is not set
 
     // App
@@ -156,4 +225,22 @@ public Ext getExt() {
         }
         return ext;
     }
+
+    @Nullable
+    public JSONObject getArbitraryConfig() {
+        return arbitraryJSONConfig;
+    }
+
+    public void setArbitraryConfig(@Nullable JSONObject config) {
+        this.arbitraryJSONConfig = config;
+    }
+
+    @Nullable
+    public String getOrtbConfig() {
+        return ortbConfig;
+    }
+
+    public void setOrtbConfig(@Nullable String ortbConfig) {
+        this.ortbConfig = ortbConfig;
+    }
 }

PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/mraid/methods/MraidExpand.java

@@ -108,6 +108,7 @@ public void destroy() {
         if (expandedDialog != null) {
             expandedDialog.dismiss();
         }
+        webViewBanner = null;
     }
 
     /**