Bump IMA/GMA versions

Author: Ian Bird

common.gradle

@@ -30,8 +30,6 @@ android {
         checkDependencies true
         checkReleaseBuilds false
         warningsAsErrors true
-
-        disable 'GradleDependency'
     }
 }
 

dev-app/build.gradle

@@ -34,6 +34,10 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion '1.4.1'
     }
+
+    lint {
+        disable 'GradleDependency'
+    }
 }
 
 dependencies {

securesignals-gma/build.gradle

@@ -23,13 +23,10 @@ android {
 
 dependencies {
     implementation project(path: ':sdk')
-
-    // We only compile against the GMA SDK as the exact version being used should be defined by the consuming
-    // application.
-    compileOnly 'com.google.android.gms:play-services-ads:21.5.0'
+    implementation 'com.google.android.gms:play-services-ads:22.0.0'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'com.google.android.gms:play-services-ads:21.5.0'
+    testImplementation 'com.google.android.gms:play-services-ads:22.0.0'
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

securesignals-gma/src/main/java/com/uid2/securesignals/gma/UID2MediationAdapter.kt

@@ -51,11 +51,21 @@ class UID2MediationAdapter : RtbAdapter() {
      * Collects the UID2 advertising token, if available.
      */
     override fun collectSignals(rtbSignalData: RtbSignalData, signalCallbacks: SignalCallbacks) {
-        val token = UID2Manager.getInstance().getAdvertisingToken()
-        if (token != null) {
-            signalCallbacks.onSuccess(token)
-        } else {
-            signalCallbacks.onFailure(AdError(0, "No Advertising Token", "UID2"))
+        UID2Manager.getInstance().let { manager ->
+            val token = manager.getAdvertisingToken()
+            if (token != null) {
+                signalCallbacks.onSuccess(token)
+            } else {
+                // We include the IdentityStatus in the "error" to have better visibility on why the Advertising Token
+                // was not present. There are a number of valid reasons why we don't have a token, but we are still
+                // required to report these as "failures".
+                signalCallbacks.onFailure(
+                    AdError(
+                        manager.currentIdentityStatus.value,
+                        "No Advertising Token",
+                        "UID2")
+                )
+            }
         }
     }
 }

securesignals-ima/build.gradle

@@ -23,13 +23,10 @@ android {
 
 dependencies {
     implementation project(path: ':sdk')
-
-    // We only compile against the IMA SDK as the exact version being used should be defined by the consuming
-    // application.
-    compileOnly 'com.google.ads.interactivemedia.v3:interactivemedia:3.29.0'
+    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.30.0'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.29.0'
+    testImplementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.30.0'
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

securesignals-ima/src/main/java/com/uid2/securesignals/ima/UID2SecureSignalsAdapter.kt

@@ -35,26 +35,32 @@ class UID2SecureSignalsAdapter: SecureSignalsAdapter {
     /**
      * Initialises the UID2 SDK with the given Context.
      */
-    override fun initialize(context: Context?, callback: SecureSignalsInitializeCallback?) {
-        if (context != null) {
+    override fun initialize(context: Context, callback: SecureSignalsInitializeCallback) {
+        // It's possible that the UID2Manager is already initialised. If so, it's a no-op.
+        if (!UID2Manager.isInitialized()) {
             UID2Manager.init(context)
-            callback?.onSuccess()
-        } else if (UID2Manager.isInitialized()) {
-            callback?.onSuccess()
-        } else {
-            callback?.onFailure(UID2SecureSignalsException("No Context provided to initialise UID2Manager"))
         }
+
+        callback.onSuccess()
     }
 
     /**
      * Collects the UID2 advertising token, if available.
      */
-    override fun collectSignals(context: Context?, callback: SecureSignalsCollectSignalsCallback?) {
-        val token = UID2Manager.getInstance().getAdvertisingToken()
-        if (token != null) {
-            callback?.onSuccess(token)
-        } else {
-            callback?.onFailure(UID2SecureSignalsException("No Advertising Token available"))
+    override fun collectSignals(context: Context, callback: SecureSignalsCollectSignalsCallback) {
+        UID2Manager.getInstance().let { manager ->
+            val token = manager.getAdvertisingToken()
+            if (token != null) {
+                callback.onSuccess(token)
+            } else {
+                // We include the IdentityStatus in the "error" to have better visibility on why the Advertising Token
+                // was not present. There are a number of valid reasons why we don't have a token, but we are still
+                // required to report these as "failures".
+                callback.onFailure(
+                    UID2SecureSignalsException(
+                        "No Advertising Token available (Status: ${manager.currentIdentityStatus.value})")
+                )
+            }
         }
     }
 }