Skip to content

uplift(beta): fix crash after account deletion #10004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephenking314 merged 1 commit into from
Oct 28, 2025
Merged

uplift(beta): fix crash after account deletion #10004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions legacy/core/src/main/java/com/fsck/k9/controller/MessagingControllerWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ class MessagingControllerWrapper(
return accountManager.getAccount(id.asRaw()) ?: error("Account not found: $id")
}

private fun getAccountDtoOrNull(id: AccountId): LegacyAccountDto? {
return accountManager.getAccount(id.asRaw())
}

fun loadMoreMessages(id: AccountId, folderId: Long) {
val account = getAccountDtoOrThrow(id)
messagingController.loadMoreMessages(account, folderId)
Expand Down Expand Up @@ -79,12 +83,12 @@ class MessagingControllerWrapper(
}

fun isMoveCapable(id: AccountId): Boolean {
val account = getAccountDtoOrThrow(id)
val account = getAccountDtoOrNull(id) ?: return false
return messagingController.isMoveCapable(account)
}

fun isCopyCapable(id: AccountId): Boolean {
val account = getAccountDtoOrThrow(id)
val account = getAccountDtoOrNull(id) ?: return false
return messagingController.isCopyCapable(account)
}

Expand Down Expand Up @@ -175,7 +179,7 @@ class MessagingControllerWrapper(
notify: Boolean,
listener: MessagingListener?,
) {
val account = id?.let { getAccountDtoOrThrow(it) }
val account = id?.let { getAccountDtoOrNull(it) }

messagingController.checkMail(
account,
Expand All @@ -187,12 +191,12 @@ class MessagingControllerWrapper(
}

fun supportsExpunge(id: AccountId): Boolean {
val account = getAccountDtoOrThrow(id)
val account = getAccountDtoOrNull(id) ?: return false
return messagingController.supportsExpunge(account)
}

fun isPushCapable(id: AccountId): Boolean {
val account = getAccountDtoOrThrow(id)
val account = getAccountDtoOrNull(id) ?: return false
return messagingController.isPushCapable(account)
}

Expand Down
Loading