mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Return early

Browse source
This commit is contained in:
chimp1984 2021-01-14 20:42:36 -05:00
parent 7ba5ab5a4e
commit 5d13fdcdbb
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessageService.java
View file

@ -296,19 +296,21 @@ public class MailboxMessageService implements SetupListener, RequestDataManager.
// mailboxMessageList while getting called.
UserThread.execute(() -> {
String uid = mailboxMessage.getUid();
if (mailboxItemsByUid.containsKey(uid)) {
// We called removeMailboxEntryFromNetwork at processMyMailboxItem,
// but in case we have not been bootstrapped at that moment it did not get removed from the network.
// So to be sure it gets removed we try to remove it now again.
// In case it was removed earlier it will return early anyway inside the p2pDataStorage.
removeMailboxEntryFromNetwork(mailboxItemsByUid.get(uid).getProtectedMailboxStorageEntry());
// We will get called the onRemoved handler which triggers removeMailboxItemFromMap as well.
// But as we use the uid from the decrypted data which is not available at onRemoved we need to
// call removeMailboxItemFromMap here. The onRemoved only removes foreign mailBoxMessages.
log.trace("## removeMailboxMsg uid={}", uid);
removeMailboxItemFromLocalStore(uid);
if (!mailboxItemsByUid.containsKey(uid)) {
return;
}
// We called removeMailboxEntryFromNetwork at processMyMailboxItem,
// but in case we have not been bootstrapped at that moment it did not get removed from the network.
// So to be sure it gets removed we try to remove it now again.
// In case it was removed earlier it will return early anyway inside the p2pDataStorage.
removeMailboxEntryFromNetwork(mailboxItemsByUid.get(uid).getProtectedMailboxStorageEntry());
// We will get called the onRemoved handler which triggers removeMailboxItemFromMap as well.
// But as we use the uid from the decrypted data which is not available at onRemoved we need to
// call removeMailboxItemFromMap here. The onRemoved only removes foreign mailBoxMessages.
log.trace("## removeMailboxMsg uid={}", uid);
removeMailboxItemFromLocalStore(uid);
});
} else {
// In case the network was not ready yet we try again later