Merge branch 'release/5.26.1'

Author: CDRussell

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

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)

app/version/version.properties

@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-VERSION=5.26.0
+VERSION=5.26.1