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

AltCoinAccountsDataModel: Handle XMR detection NullPointerException

Browse source 
The PaymentAccount.getSingleTradeCurrency(...) method can return null
in certain cases.
This commit is contained in:
Alva Swanson 2025-02-05 19:55:12 +00:00
parent 861f655ae7
commit 93985137a0
No known key found for this signature in database
GPG key ID: 004760E77F753090
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
View file

@ -81,7 +81,7 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
fillAndSortPaymentAccounts();
paymentAccounts.stream()
.filter(e -> e.getSingleTradeCurrency().getCode().equals("XMR"))
.filter(this::isXmrPaymentAccount)
.forEach(e -> {
if (!xmrAccountUsesSubAddresses(e)) {
XmrForm.showXmrSubAddressPopup();
@ -98,6 +98,11 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
}
}
private boolean isXmrPaymentAccount(PaymentAccount paymentAccount) {
TradeCurrency tradeCurrency = paymentAccount.getSingleTradeCurrency();
return tradeCurrency != null && tradeCurrency.getCode().equals("XMR");
}
private boolean xmrAccountUsesSubAddresses(PaymentAccount paymentAccount) {
if (paymentAccount instanceof CryptoCurrencyAccount) {
CryptoCurrencyAccount account = (CryptoCurrencyAccount) paymentAccount;