Merge branch 'hotfix/4.4.1'

subsymbolic · subsymbolic · commit 6b9a64bd88c8 · 2018-03-02T16:07:42.000Z
diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterTest.kt
@@ -51,7 +51,7 @@ class StatisticsRequesterTest {
         configureNoStoredStatistics()
         testee.initializeAtb()
         verify(mockService).atb()
-        verify(mockService).exti(ATB)
+        verify(mockService).exti(ATB_WITH_VARIANT)
         verify(mockStatisticsStore).atb = ATB_WITH_VARIANT
         verify(mockStatisticsStore).retentionAtb = ATB
     }
@@ -69,7 +69,7 @@ class StatisticsRequesterTest {
         configureNoStoredStatistics()
         testee.refreshRetentionAtb()
         verify(mockService).atb()
-        verify(mockService).exti(ATB)
+        verify(mockService).exti(ATB_WITH_VARIANT)
         verify(mockStatisticsStore).atb = ATB_WITH_VARIANT
         verify(mockStatisticsStore).retentionAtb = ATB
     }
diff --git a/app/src/main/java/com/duckduckgo/app/statistics/api/StatisticsRequester.kt b/app/src/main/java/com/duckduckgo/app/statistics/api/StatisticsRequester.kt
@@ -43,7 +43,7 @@ class StatisticsRequester(private val store: StatisticsDataStore, private val se
             .flatMap {
                 store.atb = it.versionWithVariant
                 store.retentionAtb = it.version
-                service.exti(it.version)
+                service.exti(it.versionWithVariant)
             }
             .subscribe({
                 Timber.v("Atb initalization succeeded")

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class StatisticsRequester(private val store: StatisticsDataStore, private val se`
`43`	`43`	`.flatMap {`
`44`	`44`	`store.atb = it.versionWithVariant`
`45`	`45`	`store.retentionAtb = it.version`
`46`		`- service.exti(it.version)`
	`46`	`+ service.exti(it.versionWithVariant)`
`47`	`47`	`}`
`48`	`48`	`.subscribe({`
`49`	`49`	`Timber.v("Atb initalization succeeded")`