Revert GMA and IMA changes

IABTechLab · Sep 9, 2024 · 7c10857 · 7c10857
1 parent ee1b41c
commit 7c10857
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 329 deletions.
diff --git a/securesignals-gma-dev-app/src/main/AndroidManifest.xml b/securesignals-gma-dev-app/src/main/AndroidManifest.xml
@@ -16,9 +16,6 @@
             android:name="com.google.android.gms.ads.APPLICATION_ID"
             android:value="ca-app-pub-3940256099942544~3347511713"/>
 
-        <!-- Metadata for toggling UID2 and EUID environments. If true, EUID is used. -->
-        <meta-data android:name="uid2_environment_euid" android:value="false"/>
-
         <activity
             android:exported="true"
             android:name="com.uid2.dev.BannerActivity">

diff --git a/securesignals-gma-dev-app/src/main/java/com/uid2/dev/BannerActivity.java b/securesignals-gma-dev-app/src/main/java/com/uid2/dev/BannerActivity.java
@@ -1,8 +1,5 @@
 package com.uid2.dev;
 
-import static com.uid2.dev.utils.BundleExKt.isEnvironmentEUID;
-import static com.uid2.dev.utils.ContextExKt.getMetadata;
-
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
@@ -14,9 +11,9 @@
 import com.google.android.gms.ads.RequestConfiguration;
 import com.google.android.gms.ads.initialization.InitializationStatus;
 import com.google.android.gms.ads.initialization.OnInitializationCompleteListener;
-import com.uid2.EUIDManager;
 import com.uid2.UID2Manager;
 import com.uid2.data.UID2Identity;
+
 import org.json.JSONObject;
 
 import java.io.BufferedReader;
@@ -104,11 +101,7 @@ private void loadUID2Identity() {
                 refreshFrom,
                 refreshExpires,
                 fromJsonIdentity.getRefreshResponseKey());
-            if (isEnvironmentEUID(getMetadata(this))) {
-                EUIDManager.getInstance().setIdentity(identity);
-            } else {
-                UID2Manager.getInstance().setIdentity(identity);
-            }
+            UID2Manager.getInstance().setIdentity(identity);
         } catch (Exception e) {
             Log.e(TAG, "Error loading Identity: " + e);
         }

diff --git a/securesignals-gma-dev-app/src/main/java/com/uid2/dev/GMADevApplication.kt b/securesignals-gma-dev-app/src/main/java/com/uid2/dev/GMADevApplication.kt
@@ -2,11 +2,7 @@ package com.uid2.dev
 
 import android.app.Application
 import android.util.Log
-import com.uid2.EUIDManager
 import com.uid2.UID2Manager
-import com.uid2.UID2Manager.Environment.Production
-import com.uid2.dev.utils.getMetadata
-import com.uid2.dev.utils.isEnvironmentEUID
 
 class GMADevApplication : Application() {
 
@@ -16,20 +12,12 @@ class GMADevApplication : Application() {
         // Initialise the UID2Manager class. We will use it's DefaultNetworkSession rather than providing our own
         // custom implementation. This can be done to allow wrapping something like OkHttp.
         try {
-            if (getMetadata().isEnvironmentEUID()) {
-                EUIDManager.init(
-                    context = this,
-                    isLoggingEnabled = true,
-                )
-            } else {
-                UID2Manager.init(
-                    context = this,
-                    environment = Production,
-                    isLoggingEnabled = true,
-                )
-            }
+            UID2Manager.init(
+                context = this,
+                isLoggingEnabled = true,
+            )
         } catch (ex: Exception) {
-            Log.e("GMADevApplication", "Error initialising UID2Manager", ex)
+            Log.e("IMADevApplication", "Error initialising UID2Manager", ex)
         }
     }
 }
diff --git a/securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/BundleEx.kt b/securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/BundleEx.kt
diff --git a/securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/ContextEx.kt b/securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/ContextEx.kt
diff --git a/securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt b/securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt
diff --git a/securesignals-gma/src/main/java/com/uid2/securesignals/gma/EUIDMediationAdapter.kt b/securesignals-gma/src/main/java/com/uid2/securesignals/gma/EUIDMediationAdapter.kt
diff --git a/securesignals-gma/src/test/java/com/uid2/securesignals/gma/EUIDMediationAdapterTest.kt b/securesignals-gma/src/test/java/com/uid2/securesignals/gma/EUIDMediationAdapterTest.kt
diff --git a/securesignals-ima-dev-app/src/main/AndroidManifest.xml b/securesignals-ima-dev-app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -10,13 +9,7 @@
         android:name=".IMADevApplication"
         android:label="@string/app_name"
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:networkSecurityConfig="@xml/network_security_config"
-        tools:ignore="UnusedAttribute">
-
-        <!-- Metadata for toggling UID2 and EUID environments. If true, EUID is used. -->
-        <meta-data android:name="uid2_environment_euid" android:value="false"/>
-
+        android:icon="@drawable/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"

diff --git a/securesignals-ima-dev-app/src/main/java/com/uid2/dev/IMADevApplication.kt b/securesignals-ima-dev-app/src/main/java/com/uid2/dev/IMADevApplication.kt
@@ -2,11 +2,7 @@ package com.uid2.dev
 
 import android.app.Application
 import android.util.Log
-import com.uid2.EUIDManager
 import com.uid2.UID2Manager
-import com.uid2.UID2Manager.Environment.Production
-import com.uid2.dev.utils.getMetadata
-import com.uid2.dev.utils.isEnvironmentEUID
 
 class IMADevApplication : Application() {
 
@@ -16,18 +12,10 @@ class IMADevApplication : Application() {
         // Initialise the UID2Manager class. We will use it's DefaultNetworkSession rather than providing our own
         // custom implementation. This can be done to allow wrapping something like OkHttp.
         try {
-            if (baseContext.getMetadata().isEnvironmentEUID()) {
-                EUIDManager.init(
-                    context = this,
-                    isLoggingEnabled = true,
-                )
-            } else {
-                UID2Manager.init(
-                    context = this,
-                    environment = Production,
-                    isLoggingEnabled = true,
-                )
-            }
+            UID2Manager.init(
+                context = this,
+                isLoggingEnabled = true,
+            )
         } catch (ex: Exception) {
             Log.e("IMADevApplication", "Error initialising UID2Manager", ex)
         }

diff --git a/securesignals-ima-dev-app/src/main/java/com/uid2/dev/MainActivity.java b/securesignals-ima-dev-app/src/main/java/com/uid2/dev/MainActivity.java
@@ -1,8 +1,5 @@
 package com.uid2.dev;
 
-import static com.uid2.dev.utils.BundleExKt.isEnvironmentEUID;
-import static com.uid2.dev.utils.ContextExKt.getMetadata;
-
 import android.content.Context;
 import android.media.AudioManager;
 import android.os.Bundle;
@@ -25,7 +22,6 @@
 import com.google.ads.interactivemedia.v3.api.ImaSdkFactory;
 import com.google.ads.interactivemedia.v3.api.ImaSdkSettings;
 import com.google.ads.interactivemedia.v3.api.player.VideoProgressUpdate;
-import com.uid2.EUIDManager;
 import com.uid2.UID2Manager;
 import com.uid2.data.UID2Identity;
 
@@ -231,11 +227,7 @@ private void loadUID2Identity() {
                 refreshExpires,
                 fromJsonIdentity.getRefreshResponseKey());
 
-            if (isEnvironmentEUID(getMetadata(getBaseContext()))) {
-                EUIDManager.getInstance().setIdentity(identity);
-            } else {
-                UID2Manager.getInstance().setIdentity(identity);
-            }
+            UID2Manager.getInstance().setIdentity(identity);
         } catch (Exception e) {
             Log.e(LOGTAG, "Error loading Identity: " + e);
         }

diff --git a/securesignals-ima-dev-app/src/main/java/com/uid2/dev/utils/BundleEx.kt b/securesignals-ima-dev-app/src/main/java/com/uid2/dev/utils/BundleEx.kt
diff --git a/securesignals-ima-dev-app/src/main/java/com/uid2/dev/utils/ContextEx.kt b/securesignals-ima-dev-app/src/main/java/com/uid2/dev/utils/ContextEx.kt
diff --git a/securesignals-ima-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt b/securesignals-ima-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt