diff --git a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt index d8deb23e..2d9842ed 100644 --- a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt +++ b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt @@ -38,21 +38,21 @@ abstract class Experiment(val context: Context, val analytics: AnalyticsManag */ protected open val qualifies: Boolean = Locale.getDefault().language == "en" - val variant: Variant by lazy { + val variant: T by lazy { when { !qualifies -> null // Device doesn't quality for experiment prefs.contains(prefKey) -> { // Variant already set - variants.firstOrNull { it.key == prefs.getString(prefKey, null) } + variants.firstOrNull { it.key == prefs.getString(prefKey, null) }?.value } else -> { // Variant hasn't been set yet variants[Random().nextInt(variants.size)].also { variant -> analytics.setUserProperty("Experiment: $key", variant.key) prefs.edit().putString(prefKey, variant.key).apply() - } + }.value } - } ?: Variant("default", default) + } ?: default } } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt index d7a8d1f0..316e5103 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt @@ -89,7 +89,7 @@ class PlusActivity : QkThemedActivity(), PlusView { override fun render(state: PlusState) { description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice) - upgrade.text = getString(upgradeButtonExperiment.variant.value, state.upgradePrice, state.currency) + upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency) upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency) val fdroid = BuildConfig.FLAVOR == "noAnalytics"