Revert GMA and IMA changes

Author: dcaunt

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">

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);
         }

securesignals-gma-dev-app/src/main/java/com/uid2/dev/GMADevApplication.kt

@@ -2,11 +2,8 @@ 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,18 +13,11 @@ 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,
+                environment = Production,
+                isLoggingEnabled = true,
+            )
         } catch (ex: Exception) {
             Log.e("GMADevApplication", "Error initialising UID2Manager", ex)
         }

securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/BundleEx.kt

@@ -14,9 +14,6 @@
         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"/>
-
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"

securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/ContextEx.kt

@@ -2,11 +2,8 @@ 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 +13,11 @@ 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,
+                environment = Production,
+                isLoggingEnabled = true,
+            )
         } catch (ex: Exception) {
             Log.e("IMADevApplication", "Error initialising UID2Manager", ex)
         }

securesignals-gma-dev-app/src/main/java/com/uid2/dev/utils/PackageManagerEx.kt

@@ -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);
         }