Merge branch 'release/5.26.1'

CDRussell · CDRussell · commit 0627c60ed6be · 2019-05-27T17:18:19.000+01:00
diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingViewModel.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingViewModel.kt
@@ -46,7 +46,6 @@ class OnboardingViewModel(
     fun onOnboardingDone() {
         onboardingStore.onboardingShown()
         fireTrackerBlockingFinalStatePixel()
-
     }
 
     private fun fireTrackerBlockingFinalStatePixel() {
@@ -59,4 +58,4 @@ class OnboardingViewModel(
             pixel.fire(pixelName)
         }
     }
-}
+}
diff --git a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
@@ -53,8 +53,8 @@ interface VariantManager {
             Variant(key = "mk", weight = 0.0, features = listOf(NotificationPrivacyDay1)),
 
             // tracker blocker opt in variants
-            Variant(key = "mm", weight = 1.0, features = emptyList()),
-            Variant(key = "mn", weight = 1.0, features = listOf(TrackerBlockingOnboardingOptIn))
+            Variant(key = "mm", weight = 0.0, features = emptyList()),
+            Variant(key = "mn", weight = 0.0, features = listOf(TrackerBlockingOnboardingOptIn))
         )
     }
 
@@ -104,6 +104,7 @@ class ExperimentationVariantManager(
     private fun generateVariant(activeVariants: List<Variant>): Variant {
         val weightSum = activeVariants.sumByDouble { it.weight }
         if (weightSum == 0.0) {
+            Timber.v("No variants active; allocating default")
             return DEFAULT_VARIANT
         }
         val randomizedIndex = indexRandomizer.random(activeVariants)
diff --git a/app/version/version.properties b/app/version/version.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-VERSION=5.26.0
+VERSION=5.26.1

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ class OnboardingViewModel(`
`46`	`46`	`fun onOnboardingDone() {`
`47`	`47`	`onboardingStore.onboardingShown()`
`48`	`48`	`fireTrackerBlockingFinalStatePixel()`
`49`		`-`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`private fun fireTrackerBlockingFinalStatePixel() {`
`@@ -59,4 +58,4 @@ class OnboardingViewModel(`
`59`	`58`	`pixel.fire(pixelName)`
`60`	`59`	`}`
`61`	`60`	`}`
`62`		`-}`
	`61`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ interface VariantManager {`
`53`	`53`	`Variant(key = "mk", weight = 0.0, features = listOf(NotificationPrivacyDay1)),`
`54`	`54`
`55`	`55`	`// tracker blocker opt in variants`
`56`		`- Variant(key = "mm", weight = 1.0, features = emptyList()),`
`57`		`- Variant(key = "mn", weight = 1.0, features = listOf(TrackerBlockingOnboardingOptIn))`
	`56`	`+ Variant(key = "mm", weight = 0.0, features = emptyList()),`
	`57`	`+ Variant(key = "mn", weight = 0.0, features = listOf(TrackerBlockingOnboardingOptIn))`
`58`	`58`	`)`
`59`	`59`	`}`
`60`	`60`
`@@ -104,6 +104,7 @@ class ExperimentationVariantManager(`
`104`	`104`	`private fun generateVariant(activeVariants: List<Variant>): Variant {`
`105`	`105`	`val weightSum = activeVariants.sumByDouble { it.weight }`
`106`	`106`	`if (weightSum == 0.0) {`
	`107`	`+ Timber.v("No variants active; allocating default")`
`107`	`108`	`return DEFAULT_VARIANT`
`108`	`109`	`}`
`109`	`110`	`val randomizedIndex = indexRandomizer.random(activeVariants)`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`	`16`
`17`		`-VERSION=5.26.0`
	`17`	`+VERSION=5.26.1`