From 7d6b75b326e861216641646f006c1cad0c5597aa Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 3 Nov 2020 18:11:09 +0100
Subject: [PATCH] Fix crash when deleting account

---
 .../core/viewmodel/account/list/AccountListViewModel.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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<AccountViewItem> viewItems = new ArrayList<>();
                 for (Map.Entry<UUID, ConnectionState> 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();