Fix crash when signing back into tasks.org

pull/2068/head
Alex Baker 2 years ago
parent 390265a9df
commit eb3dd461ad

@ -21,6 +21,7 @@ import org.tasks.BuildConfig
import org.tasks.LocalBroadcastManager import org.tasks.LocalBroadcastManager
import org.tasks.R import org.tasks.R
import org.tasks.auth.SignInActivity import org.tasks.auth.SignInActivity
import org.tasks.auth.SignInActivity.Platform
import org.tasks.billing.Inventory import org.tasks.billing.Inventory
import org.tasks.billing.Purchase import org.tasks.billing.Purchase
import org.tasks.data.CaldavAccount import org.tasks.data.CaldavAccount
@ -149,7 +150,7 @@ class TasksAccount : BaseAccountPreference() {
localBroadcastManager.unregisterReceiver(refreshReceiver) localBroadcastManager.unregisterReceiver(refreshReceiver)
} }
private val isGitHubAccount: Boolean private val isGithub: Boolean
get() = caldavAccount.username?.startsWith("github") == true get() = caldavAccount.username?.startsWith("github") == true
private fun refreshUi(account: CaldavAccount) { private fun refreshUi(account: CaldavAccount) {
@ -162,9 +163,10 @@ class TasksAccount : BaseAccountPreference() {
when { when {
account.isPaymentRequired() -> { account.isPaymentRequired() -> {
val subscription = inventory.subscription.value val subscription = inventory.subscription.value
if (isGitHubAccount) { if (isGithub) {
title = null title = null
setSummary(R.string.insufficient_sponsorship) setSummary(R.string.insufficient_sponsorship)
@Suppress("KotlinConstantConditions")
if (BuildConfig.FLAVOR == "googleplay") { if (BuildConfig.FLAVOR == "googleplay") {
onPreferenceClickListener = null onPreferenceClickListener = null
} else { } else {
@ -185,7 +187,7 @@ class TasksAccount : BaseAccountPreference() {
} }
} }
account.isLoggedOut() -> { account.isLoggedOut() -> {
setTitle(if (isGitHubAccount) { setTitle(if (isGithub) {
R.string.sign_in_with_github R.string.sign_in_with_github
} else { } else {
R.string.sign_in_with_google R.string.sign_in_with_google
@ -195,8 +197,8 @@ class TasksAccount : BaseAccountPreference() {
activity?.startActivityForResult( activity?.startActivityForResult(
Intent(activity, SignInActivity::class.java) Intent(activity, SignInActivity::class.java)
.putExtra( .putExtra(
SignInActivity.EXTRA_SELECT_SERVICE, SignInActivity.EXTRA_SELECT_SERVICE,
if (isGitHubAccount) 1 else 0 if (isGithub) Platform.GITHUB else Platform.GOOGLE
), ),
REQUEST_TASKS_ORG) REQUEST_TASKS_ORG)
false false

Loading…
Cancel
Save