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

Add check if xmrTxProof is used to avoid null pointer exception

Browse source
This commit is contained in:
chimp1984 2020-09-04 14:51:34 -05:00
parent 61c071184e
commit c87899c662
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
View file

@ -77,7 +77,6 @@ import static bisq.desktop.util.FormBuilder.*;
public class SellerStep3View extends TradeStepView {
private final ChangeListener<Number> proofResultListener;
private Button confirmButton;
private Label statusLabel;
private BusyAnimation busyAnimation;
@ -85,6 +84,8 @@ public class SellerStep3View extends TradeStepView {
private Timer timeoutTimer;
private InfoTextField assetTxProofResultField;
private TxConfidenceIndicator assetTxConfidenceIndicator;
private ChangeListener<Number> proofResultListener;
private boolean useXmrTxProof;
///////////////////////////////////////////////////////////////////////////////////////////
@ -93,10 +94,6 @@ public class SellerStep3View extends TradeStepView {
public SellerStep3View(PendingTradesViewModel model) {
super(model);
proofResultListener = (observable, oldValue, newValue) -> {
applyAssetTxProofResult(trade.getAssetTxProofResult());
};
}
@Override
@ -157,13 +154,19 @@ public class SellerStep3View extends TradeStepView {
}
});
// we listen for updates on the trade autoConfirmResult field
if (assetTxProofResultField != null) {
trade.getAssetTxProofResultUpdateProperty().addListener(proofResultListener);
if (useXmrTxProof) {
proofResultListener = (observable, oldValue, newValue) -> {
applyAssetTxProofResult(trade.getAssetTxProofResult());
};
// we listen for updates on the trade autoConfirmResult field
if (assetTxProofResultField != null) {
trade.getAssetTxProofResultUpdateProperty().addListener(proofResultListener);
applyAssetTxProofResult(trade.getAssetTxProofResult());
}
applyAssetTxProofResult(trade.getAssetTxProofResult());
}
applyAssetTxProofResult(trade.getAssetTxProofResult());
}
@Override
@ -181,7 +184,7 @@ public class SellerStep3View extends TradeStepView {
timeoutTimer.stop();
}
if (assetTxProofResultField != null) {
if (useXmrTxProof && assetTxProofResultField != null) {
trade.getAssetTxProofResultUpdateProperty().removeListener(proofResultListener);
}
}
@ -235,7 +238,8 @@ public class SellerStep3View extends TradeStepView {
GridPane.setRowSpan(titledGroupBg, 4);
}
if (isBlockChain && trade.getOffer().getCurrencyCode().equals("XMR")) {
useXmrTxProof = isBlockChain && trade.getOffer().getCurrencyCode().equals("XMR");
if (useXmrTxProof) {
assetTxProofResultField = new InfoTextField();
Tuple2<Label, VBox> topLabelWithVBox = getTopLabelWithVBox(Res.get("portfolio.pending.step3_seller.autoConf.status.label"), assetTxProofResultField);