diff --git a/domain/src/main/java/org/mercury_im/messenger/core/viewmodel/account/list/AccountListViewModel.java b/domain/src/main/java/org/mercury_im/messenger/core/viewmodel/account/list/AccountListViewModel.java index aa2c5fd..49954aa 100644 --- a/domain/src/main/java/org/mercury_im/messenger/core/viewmodel/account/list/AccountListViewModel.java +++ b/domain/src/main/java/org/mercury_im/messenger/core/viewmodel/account/list/AccountListViewModel.java @@ -77,8 +77,11 @@ public class AccountListViewModel implements MercuryViewModel { return upstream.map(state -> { List viewItems = new ArrayList<>(); for (Map.Entry entry : state.getConnectionStates().entrySet()) { - ConnectionState connectionState = entry.getValue(); Account account = accountRepository.getAccount(entry.getKey()).blockingGet(); + if (account == null) { + continue; + } + ConnectionState connectionState = entry.getValue(); OpenPgpV4Fingerprint fingerprint = null; try { PGPSecretKeyRingCollection secretKeyRings = openPgpRepository.loadSecretKeysOf(account.getId(), account.getJid()).blockingGet();