From 8278058fa6733c7bd2a84c472b512809aabb58dd Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 14 Jan 2021 09:05:26 -0600 Subject: [PATCH] Get tasks account from viewModel --- .../tasks/preferences/fragments/MainSettingsFragment.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt b/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt index 6b62e26d3..506be5f2e 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt @@ -10,8 +10,6 @@ import kotlinx.coroutines.launch import org.tasks.BuildConfig import org.tasks.R import org.tasks.auth.SignInActivity -import org.tasks.data.CaldavAccount -import org.tasks.data.CaldavDao import org.tasks.injection.InjectingPreferenceFragment import org.tasks.preferences.IconPreference import org.tasks.preferences.MainPreferences @@ -26,7 +24,6 @@ class MainSettingsFragment : InjectingPreferenceFragment() { @Inject lateinit var appWidgetManager: AppWidgetManager @Inject lateinit var preferences: Preferences - @Inject lateinit var caldavDao: CaldavDao private val viewModel: PreferencesViewModel by activityViewModels() @@ -65,13 +62,12 @@ class MainSettingsFragment : InjectingPreferenceFragment() { .getDrawable(requireContext(), R.drawable.ic_keyboard_arrow_right_24px) ?.mutate() pref.tint = context?.getColor(R.color.icon_tint_with_alpha) - val accounts = caldavDao.getAccounts(CaldavAccount.TYPE_TASKS) - if (accounts.isEmpty()) { + val account = viewModel.tasksAccount() + if (account == null) { pref.setOnPreferenceClickListener { signIn() } pref.summary = getString(R.string.not_signed_in) return } - val account = accounts.first() pref.summary = account.name if (!account.error.isNullOrBlank()) {