Make `AccountManager.getAccountsFlow()` only return fully set up accounts (73d91000) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/Preferences.kt

+5 −2

Original line number	Diff line number	Diff line
		@@ -110,6 +110,9 @@ class Preferences internal constructor(
		}
		}

		private val completeAccounts: List<Account>
		get() = accounts.filter { it.isFinishedSetup }

		override fun getAccount(accountUuid: String): Account? {
		synchronized(accountLock) {
		if (accountsMap == null) {
		@@ -151,10 +154,10 @@ class Preferences internal constructor(
		@OptIn(ExperimentalCoroutinesApi::class)
		override fun getAccountsFlow(): Flow<List<Account>> {
		return callbackFlow {
		send(accounts)
		send(completeAccounts)

		val listener = AccountsChangeListener {
		trySendBlocking(accounts)
		trySendBlocking(completeAccounts)
		}
		addOnAccountsChangeListener(listener)

+2 −3

Original line number	Diff line number	Diff line
		@@ -77,11 +77,10 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {

		private fun populateSettingsList() {
		viewModel.accounts.observeNotNull(this) { accounts ->
		val accountsFinishedSetup = accounts.filter { it.isFinishedSetup }
		if (accountsFinishedSetup.isEmpty()) {
		if (accounts.isEmpty()) {
		launchOnboarding()
		} else {
		populateSettingsList(accountsFinishedSetup)
		populateSettingsList(accounts)
		}
		}
		}