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

Improve handling of nullable assetTxProof fields

Browse source
This commit is contained in:
chimp1984 2020-09-06 12:05:39 -05:00 • committed by Christoph Atteneder
parent 9eb7900d51
commit b1b3136969
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,8 +85,11 @@ public class SellerStep3View extends TradeStepView {
private BusyAnimation busyAnimation;
private Subscription tradeStatePropertySubscription;
private Timer timeoutTimer;
@Nullable
private InfoTextField assetTxProofResultField;
@Nullable
private TxConfidenceIndicator assetTxConfidenceIndicator;
@Nullable
private ChangeListener<Number> proofResultListener;
private boolean useXmrTxProof;
@ -157,16 +160,12 @@ public class SellerStep3View extends TradeStepView {
}
});
useXmrTxProof = getCurrencyCode(trade).equals("XMR");
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());
}
trade.getAssetTxProofResultUpdateProperty().addListener(proofResultListener);
applyAssetTxProofResult(trade.getAssetTxProofResult());
}
@ -187,7 +186,7 @@ public class SellerStep3View extends TradeStepView {
timeoutTimer.stop();
}
if (useXmrTxProof && assetTxProofResultField != null) {
if (useXmrTxProof) {
trade.getAssetTxProofResultUpdateProperty().removeListener(proofResultListener);
}
}
@ -253,7 +252,6 @@ public class SellerStep3View extends TradeStepView {
GridPane.setRowSpan(titledGroupBg, 4);
}
useXmrTxProof = isBlockChain && getCurrencyCode(trade).equals("XMR");
if (useXmrTxProof) {
assetTxProofResultField = new InfoTextField();
@ -493,8 +491,12 @@ public class SellerStep3View extends TradeStepView {
}
private void applyAssetTxProofResult(@Nullable AssetTxProofResult result) {
checkNotNull(assetTxProofResultField);
checkNotNull(assetTxConfidenceIndicator);
String txt = GUIUtil.getProofResultAsString(result);
assetTxProofResultField.setText(txt);
if (result == null) {
assetTxConfidenceIndicator.setProgress(0);
return;