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

Add new methods, make decryptedMessageWithPubKey nullable

Browse source
This commit is contained in:
chimp1984 2021-01-10 18:56:39 -05:00
parent 4fc35a7b39
commit 4c7b56072f
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
1 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
p2p/src/main/java/bisq/network/p2p/mailbox/MailboxItem.java
View file

@ -24,31 +24,70 @@ import bisq.common.proto.ProtobufferException;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.proto.persistable.PersistablePayload;
import java.time.Clock;
import java.util.Optional;
import lombok.Value;
import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
@Value
public class MailboxItem implements PersistablePayload {
private final ProtectedMailboxStorageEntry protectedMailboxStorageEntry;
@Nullable
private final DecryptedMessageWithPubKey decryptedMessageWithPubKey;
public MailboxItem(ProtectedMailboxStorageEntry protectedMailboxStorageEntry,
DecryptedMessageWithPubKey decryptedMessageWithPubKey) {
@Nullable DecryptedMessageWithPubKey decryptedMessageWithPubKey) {
this.protectedMailboxStorageEntry = protectedMailboxStorageEntry;
this.decryptedMessageWithPubKey = decryptedMessageWithPubKey;
}
@Override
public protobuf.MailboxItem toProtoMessage() {
return protobuf.MailboxItem.newBuilder()
.setProtectedMailboxStorageEntry(protectedMailboxStorageEntry.toProtoMessage())
.setDecryptedMessageWithPubKey(decryptedMessageWithPubKey.toProtoMessage())
protobuf.MailboxItem.Builder builder = protobuf.MailboxItem.newBuilder()
.setProtectedMailboxStorageEntry(protectedMailboxStorageEntry.toProtoMessage());
Optional.ofNullable(decryptedMessageWithPubKey).ifPresent(decryptedMessageWithPubKey ->
builder.setDecryptedMessageWithPubKey(decryptedMessageWithPubKey.toProtoMessage()));
return builder
.build();
}
public static MailboxItem fromProto(protobuf.MailboxItem proto, NetworkProtoResolver networkProtoResolver)
throws ProtobufferException {
DecryptedMessageWithPubKey decryptedMessageWithPubKey = proto.hasDecryptedMessageWithPubKey() ?
DecryptedMessageWithPubKey.fromProto(proto.getDecryptedMessageWithPubKey(), networkProtoResolver) :
null;
return new MailboxItem(ProtectedMailboxStorageEntry.fromProto(proto.getProtectedMailboxStorageEntry(),
networkProtoResolver),
DecryptedMessageWithPubKey.fromProto(proto.getDecryptedMessageWithPubKey(), networkProtoResolver));
decryptedMessageWithPubKey);
}
public boolean isMine() {
return decryptedMessageWithPubKey != null;
}
public String getUid() {
if (decryptedMessageWithPubKey != null) {
// We use uid from mailboxMessage in case its ours as we have the at removeMailboxMsg only the
// decryptedMessageWithPubKey available which contains the mailboxMessage.
MailboxMessage mailboxMessage = (MailboxMessage) checkNotNull(decryptedMessageWithPubKey).getNetworkEnvelope();
return mailboxMessage.getUid();
} else {
// If its not our mailbox msg we take the uid from the prefixedSealedAndSignedMessage instead.
// Those will never be removed via removeMailboxMsg but we clean up expired entries at startup.
return protectedMailboxStorageEntry.getMailboxStoragePayload().getPrefixedSealedAndSignedMessage().getUid();
}
}
public boolean isExpired(Clock clock) {
return protectedMailboxStorageEntry.isExpired(clock);
}
}