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

Remove nullable return value from decryptProtectedMailboxStorageEntry

Browse source 
Remove Objects::nonNull check
Split handleMailboxItem into 2 methods for persisting and
for processing my mailbox msg
This commit is contained in:
chimp1984 2021-01-10 19:03:19 -05:00
parent 79363e7fa8
commit 63a0117b4b
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
@ -378,12 +377,10 @@ public class MailboxMessageService implements SetupListener, RequestDataManager.
Set<MailboxItem> decryptedMailboxMessageWithEntries = new HashSet<>();
protectedMailboxStorageEntries.stream()
.map(this::decryptProtectedMailboxStorageEntry)
.filter(Objects::nonNull)
.forEach(decryptedMailboxMessageWithEntries::add);
return decryptedMailboxMessageWithEntries;
}
@Nullable
private MailboxItem decryptProtectedMailboxStorageEntry(ProtectedMailboxStorageEntry protectedMailboxStorageEntry) {
PrefixedSealedAndSignedMessage prefixedSealedAndSignedMessage = protectedMailboxStorageEntry
.getMailboxStoragePayload()
@ -392,7 +389,8 @@ public class MailboxMessageService implements SetupListener, RequestDataManager.
String uid = prefixedSealedAndSignedMessage.getUid();
if (ignoredMailboxService.isIgnored(uid)) {
// We had persisted a past failed decryption attempt on that message so we don't try again and return early
return null;
return new MailboxItem(protectedMailboxStorageEntry, null);
}
try {
DecryptedMessageWithPubKey decryptedMessageWithPubKey = encryptionService.decryptAndVerify(sealedAndSigned);
@ -406,18 +404,25 @@ public class MailboxMessageService implements SetupListener, RequestDataManager.
log.error(e.toString());
e.getStackTrace();
}
return null;
return new MailboxItem(protectedMailboxStorageEntry, null);
}
private void handleMailboxItem(MailboxItem mailboxItem) {
DecryptedMessageWithPubKey decryptedMessageWithPubKey = mailboxItem.getDecryptedMessageWithPubKey();
MailboxMessage mailboxMessage = (MailboxMessage) decryptedMessageWithPubKey.getNetworkEnvelope();
String uid = mailboxMessage.getUid();
String uid = mailboxItem.getUid();
mailboxItemsByUid.putIfAbsent(uid, new ArrayList<>());
mailboxItemsByUid.get(uid).add(mailboxItem);
mailboxMessageList.add(mailboxItem);
requestPersistence();
if (mailboxItem.isMine()) {
processMyMailboxItem(mailboxItem, uid);
}
}
private void processMyMailboxItem(MailboxItem mailboxItem, String uid) {
DecryptedMessageWithPubKey decryptedMessageWithPubKey = checkNotNull(mailboxItem.getDecryptedMessageWithPubKey());
MailboxMessage mailboxMessage = (MailboxMessage) decryptedMessageWithPubKey.getNetworkEnvelope();
NodeAddress sender = mailboxMessage.getSenderNodeAddress();
log.info("Received a {} mailbox message with uid {} and senderAddress {}",
mailboxMessage.getClass().getSimpleName(), uid, sender);