diff --git a/app/src/generic/java/org/tasks/analytics/Firebase.kt b/app/src/generic/java/org/tasks/analytics/Firebase.kt index d371fa0faa..f8f4ff9517 100644 --- a/app/src/generic/java/org/tasks/analytics/Firebase.kt +++ b/app/src/generic/java/org/tasks/analytics/Firebase.kt @@ -24,8 +24,6 @@ class Firebase @Inject constructor( get() = installCooldown || preferences.lastSubscribeRequest + days(28L) > currentTimeMillis() - val nameYourPrice = false - private val installCooldown: Boolean get() = preferences.installDate + days(7L) > currentTimeMillis() diff --git a/app/src/googleplay/java/org/tasks/analytics/Firebase.kt b/app/src/googleplay/java/org/tasks/analytics/Firebase.kt index de46bbdc0c..4e330c2e4b 100644 --- a/app/src/googleplay/java/org/tasks/analytics/Firebase.kt +++ b/app/src/googleplay/java/org/tasks/analytics/Firebase.kt @@ -75,9 +75,6 @@ class Firebase @Inject constructor( get() = installCooldown || preferences.lastSubscribeRequest + days("subscribe_cooldown", 30L) > currentTimeMillis() - val nameYourPrice: Boolean - get() = remoteConfig?.getBoolean("name_your_price") ?: false - private fun days(key: String, default: Long): Long = TimeUnit.DAYS.toMillis(remoteConfig?.getLong(key) ?: default) diff --git a/app/src/main/java/org/tasks/auth/SignInActivity.kt b/app/src/main/java/org/tasks/auth/SignInActivity.kt index 22799a9a23..c160ea4438 100644 --- a/app/src/main/java/org/tasks/auth/SignInActivity.kt +++ b/app/src/main/java/org/tasks/auth/SignInActivity.kt @@ -44,6 +44,7 @@ import org.tasks.analytics.Firebase import org.tasks.billing.Inventory import org.tasks.billing.PurchaseActivity import org.tasks.billing.PurchaseActivityViewModel.Companion.EXTRA_GITHUB +import org.tasks.billing.PurchaseActivityViewModel.Companion.EXTRA_NAME_YOUR_PRICE import org.tasks.compose.ConsentDialog import org.tasks.compose.SignInDialog import org.tasks.dialogs.DialogBuilder @@ -163,7 +164,8 @@ class SignInActivity : ComponentActivity() { if (e is HttpException && e.code == 402) { startActivityForResult( Intent(this, PurchaseActivity::class.java) - .putExtra(EXTRA_GITHUB, viewModel.authService?.isGitHub ?: IS_GENERIC), + .putExtra(EXTRA_GITHUB, viewModel.authService?.isGitHub ?: IS_GENERIC) + .putExtra(EXTRA_NAME_YOUR_PRICE, false), RC_PURCHASE ) } else { diff --git a/app/src/main/java/org/tasks/billing/PurchaseActivityViewModel.kt b/app/src/main/java/org/tasks/billing/PurchaseActivityViewModel.kt index e9b56beaed..a5f87bb6a7 100644 --- a/app/src/main/java/org/tasks/billing/PurchaseActivityViewModel.kt +++ b/app/src/main/java/org/tasks/billing/PurchaseActivityViewModel.kt @@ -56,7 +56,7 @@ class PurchaseActivityViewModel @Inject constructor( private val _viewState = MutableStateFlow( ViewState( - nameYourPrice = savedStateHandle.get(EXTRA_NAME_YOUR_PRICE) ?: firebase.nameYourPrice, + nameYourPrice = savedStateHandle.get(EXTRA_NAME_YOUR_PRICE) ?: true, isGithub = savedStateHandle.get(EXTRA_GITHUB) ?: false, ) ) @@ -113,7 +113,7 @@ class PurchaseActivityViewModel @Inject constructor( } fun setNameYourPrice(nameYourPrice: Boolean) { - _viewState.update { it.copy(nameYourPrice = nameYourPrice) } + _viewState.update { it.copy(nameYourPrice = nameYourPrice) } } fun dismissError() { diff --git a/app/src/main/java/org/tasks/compose/IconPickerActivity.kt b/app/src/main/java/org/tasks/compose/IconPickerActivity.kt index 36149b32c7..bdb66c0470 100644 --- a/app/src/main/java/org/tasks/compose/IconPickerActivity.kt +++ b/app/src/main/java/org/tasks/compose/IconPickerActivity.kt @@ -24,7 +24,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel import dagger.hilt.android.AndroidEntryPoint import org.tasks.billing.Inventory import org.tasks.billing.PurchaseActivity -import org.tasks.billing.PurchaseActivityViewModel.Companion.EXTRA_NAME_YOUR_PRICE import org.tasks.compose.pickers.IconPicker import org.tasks.compose.pickers.IconPickerViewModel import org.tasks.themes.TasksTheme @@ -67,10 +66,7 @@ class IconPickerActivity : AppCompatActivity() { }, hasPro = hasPro, subscribe = { - startActivity( - Intent(this, PurchaseActivity::class.java) - .putExtra(EXTRA_NAME_YOUR_PRICE, true) - ) + startActivity(Intent(this, PurchaseActivity::class.java)) }, ) } @@ -80,7 +76,6 @@ class IconPickerActivity : AppCompatActivity() { companion object { const val EXTRA_SELECTED = "extra_selected" - const val EXTRA_ICON = "extra_icon" fun ComponentActivity.registerForIconPickerResult(callback: (String) -> Unit): ActivityResultLauncher { return registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {