Skip to content

Keep the Google Advertising ID per SDK instance #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jrosendahl-opt wants to merge 1 commit into from
Closed

Keep the Google Advertising ID per SDK instance #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions android_sdk/src/main/java/co/optable/sdk/core/GoogleAdIdManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ internal class GoogleAdIdManager(
val config: OptableConfig,
) {

companion object {
private var adId: String? = null
private var limitAdTracking: Boolean? = null
}
// Per instance, so an instance created with skipAdvertisingIdDetection never sends an ID another instance read.
private var adId: String? = null
private var limitAdTracking: Boolean? = null

val deferredTask = CompletableDeferred<String?>()

Expand Down
47 changes: 34 additions & 13 deletions android_sdk/src/test/java/co/optable/sdk/core/GoogleAdIdManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,11 @@ class GoogleAdIdManagerTest {
every { Log.w(any(), any<String>()) } returns 0

mockkStatic(AdvertisingIdClient::class)

resetCompanionState()
}

@After
fun teardown() {
unmockkAll()
resetCompanionState()
}

@Test
Expand Down Expand Up @@ -169,18 +166,42 @@ class GoogleAdIdManagerTest {
verify(exactly = 1) { AdvertisingIdClient.getAdvertisingIdInfo(context) }
}

@Test
fun `getId returns null when skip detection is true even after another instance fetched an ad id`() = runTest {
val mockInfo = mockk<AdvertisingIdClient.Info> {
every { id } returns "12345-abcde"
every { isLimitAdTrackingEnabled } returns false
}
every { AdvertisingIdClient.getAdvertisingIdInfo(context) } returns mockInfo
manager.fetchAdvertisingId()

val skipConfig = mockk<OptableConfig> {
every { context } returns this@GoogleAdIdManagerTest.context
every { skipAdvertisingIdDetection } returns true
}
val skipManager = GoogleAdIdManager(skipConfig)
skipManager.fetchAdvertisingId()

private fun resetCompanionState() {
try {
val adIdField = GoogleAdIdManager::class.java.getDeclaredField("adId")
adIdField.isAccessible = true
adIdField.set(null, null)
assertNull(skipManager.getId())
}

val limitField = GoogleAdIdManager::class.java.getDeclaredField("limitAdTracking")
limitField.isAccessible = true
limitField.set(null, null)
} catch (e: Exception) {
e.printStackTrace()
@Test
fun `limit ad tracking read by one instance does not affect another`() = runTest {
val limitedInfo = mockk<AdvertisingIdClient.Info> {
every { id } returns "12345-abcde"
every { isLimitAdTrackingEnabled } returns true
}
val unlimitedInfo = mockk<AdvertisingIdClient.Info> {
every { id } returns "12345-abcde"
every { isLimitAdTrackingEnabled } returns false
}
every { AdvertisingIdClient.getAdvertisingIdInfo(context) } returnsMany listOf(unlimitedInfo, limitedInfo)

manager.fetchAdvertisingId()
val laterManager = GoogleAdIdManager(config)
laterManager.fetchAdvertisingId()

assertEquals("12345-abcde", manager.getId())
assertNull(laterManager.getId())
}
}
Loading