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

Only add offers if it is not in list

Browse source
This commit is contained in:
Manfred Karrer 2018-01-21 12:06:38 -05:00
parent 02f04d3129
commit 8b98429341
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java
View file

@ -53,20 +53,31 @@ public class OfferBook {
offerBookService.addOfferBookChangedListener(new OfferBookService.OfferBookChangedListener() { offerBookService.addOfferBookChangedListener(new OfferBookService.OfferBookChangedListener() {
@Override @Override
public void onAdded(Offer offer) { public void onAdded(Offer offer) {
OfferBookListItem offerBookListItem = new OfferBookListItem(offer); // We get onAdded called every time a new ProtectedStorageEntry is received.
// We don't use the contains method as the equals method in Offer takes state and errorMessage into account. // Mostly it is the same OfferPayload but the ProtectedStorageEntry is different.
// If we have an offer with same ID we remove it and add the new offer as it might have a changed state. // We filter here to only add new offers if the same offer (using equals) was not already added.
Optional<OfferBookListItem> candidateToRemove = offerBookListItems.stream() boolean hasSameOffer = offerBookListItems.stream()
.filter(item -> item.getOffer().getId().equals(offer.getId())) .filter(item -> item.getOffer().equals(offer))
.findAny(); .findAny()
if (candidateToRemove.isPresent()) { .isPresent();
log.info("We had an old offer in the list with the same Offer ID. Might be that the state or errorMessage was different. " + if (!hasSameOffer) {
"old offerBookListItem={}, new offerBookListItem={}", candidateToRemove.get(), offerBookListItem); OfferBookListItem offerBookListItem = new OfferBookListItem(offer);
offerBookListItems.remove(candidateToRemove.get()); // We don't use the contains method as the equals method in Offer takes state and errorMessage into account.
} // If we have an offer with same ID we remove it and add the new offer as it might have a changed state.
Optional<OfferBookListItem> candidateWithSameId = offerBookListItems.stream()
.filter(item -> item.getOffer().getId().equals(offer.getId()))
.findAny();
if (candidateWithSameId.isPresent()) {
log.warn("We had an old offer in the list with the same Offer ID. Might be that the state or errorMessage was different. " +
"old offerBookListItem={}, new offerBookListItem={}", candidateWithSameId.get(), offerBookListItem);
offerBookListItems.remove(candidateWithSameId.get());
}
offerBookListItems.add(offerBookListItem); offerBookListItems.add(offerBookListItem);
Log.logIfStressTests("OfferPayload added: No. of offers = " + offerBookListItems.size()); Log.logIfStressTests("OfferPayload added: No. of offers = " + offerBookListItems.size());
}else{
log.debug("We have the exact same offer already in our list and ignore the onAdded call. ID={}", offer.getId());
}
} }
@Override @Override