mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve filter

Browse Source
This commit is contained in:
Manfred Karrer 2019-04-12 18:52:00 -05:00
parent 813365df1e
commit 8a3f42c572
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
desktop/src/main/java/bisq/desktop/main/disputes/arbitrator/ArbitratorDisputeView.java
View File

@ -62,16 +62,21 @@ public class ArbitratorDisputeView extends TraderDisputeView {
@Override
protected void applyFilteredListPredicate(String filterString) {
// If in arbitrator view we must only display disputes where we are selected as arbitrator (must not receive others anyway)
filteredList.setPredicate(dispute ->
dispute.getArbitratorPubKeyRing().equals(keyRing.getPubKeyRing()) &&
(filterString.isEmpty() ||
(dispute.getId().contains(filterString) ||
(!dispute.isClosed() && filterString.toLowerCase().equals("open")) ||
formatter.formatDate(dispute.getOpeningDate()).contains(filterString)) ||
getBuyerOnionAddressColumnLabel(dispute).contains(filterString) ||
getSellerOnionAddressColumnLabel(dispute).contains(filterString)
filteredList.setPredicate(dispute -> {
boolean matchesTradeId = dispute.getTradeId().contains(filterString);
boolean matchesDate = formatter.formatDate(dispute.getOpeningDate()).contains(filterString);
boolean isBuyerOnion = getBuyerOnionAddressColumnLabel(dispute).contains(filterString);
boolean isSellerOnion = getSellerOnionAddressColumnLabel(dispute).contains(filterString);
boolean matchesBuyersPaymentAccountData = dispute.getContract().getBuyerPaymentAccountPayload().getPaymentDetails().contains(filterString);
boolean matchesSellersPaymentAccountData = dispute.getContract().getSellerPaymentAccountPayload().getPaymentDetails().contains(filterString);
));
boolean anyMatch = matchesTradeId || matchesDate || isBuyerOnion || isSellerOnion ||
matchesBuyersPaymentAccountData || matchesSellersPaymentAccountData;
boolean open = !dispute.isClosed() && filterString.toLowerCase().equals("open");
boolean isMyCase = dispute.getArbitratorPubKeyRing().equals(keyRing.getPubKeyRing());
return isMyCase && (open || filterString.isEmpty() || anyMatch);
});
}
}