nihilist/haveno-reto
1
0
Fork 0
mirror of https://github.com/retoaccess1/haveno-reto.git synced 2024-11-10 13:13:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

init offer address entry off user thread to prevent blocking

Browse Source
This commit is contained in:
woodser 2024-01-17 20:28:28 -05:00
parent e956114239
commit 49ee3b19b1
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
desktop/src/main/java/haveno/desktop/main/offer/MutableOfferDataModel.java
View File

@ -95,7 +95,6 @@ public abstract class MutableOfferDataModel extends OfferDataModel {
private final CoinFormatter btcFormatter; private final CoinFormatter btcFormatter;
private final Navigation navigation; private final Navigation navigation;
private final String offerId; private final String offerId;
private final XmrBalanceListener xmrBalanceListener;
private final SetChangeListener<PaymentAccount> paymentAccountsChangeListener; private final SetChangeListener<PaymentAccount> paymentAccountsChangeListener;
protected OfferDirection direction; protected OfferDirection direction;
@ -128,6 +127,7 @@ public abstract class MutableOfferDataModel extends OfferDataModel {
protected long triggerPrice; protected long triggerPrice;
@Getter @Getter
protected boolean reserveExactAmount; protected boolean reserveExactAmount;
private XmrBalanceListener xmrBalanceListener;
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@ -163,20 +163,12 @@ public abstract class MutableOfferDataModel extends OfferDataModel {
offerId = OfferUtil.getRandomOfferId(); offerId = OfferUtil.getRandomOfferId();
shortOfferId = Utilities.getShortId(offerId); shortOfferId = Utilities.getShortId(offerId);
addressEntry = xmrWalletService.getOrCreateAddressEntry(offerId, XmrAddressEntry.Context.OFFER_FUNDING);
reserveExactAmount = preferences.getSplitOfferOutput(); reserveExactAmount = preferences.getSplitOfferOutput();
useMarketBasedPrice.set(preferences.isUsePercentageBasedPrice()); useMarketBasedPrice.set(preferences.isUsePercentageBasedPrice());
buyerSecurityDepositPct.set(Restrictions.getMinBuyerSecurityDepositAsPercent()); buyerSecurityDepositPct.set(Restrictions.getMinBuyerSecurityDepositAsPercent());
xmrBalanceListener = new XmrBalanceListener(getAddressEntry().getSubaddressIndex()) {
@Override
public void onBalanceChanged(BigInteger balance) {
updateBalance();
}
};
paymentAccountsChangeListener = change -> fillPaymentAccounts(); paymentAccountsChangeListener = change -> fillPaymentAccounts();
} }
@ -212,6 +204,14 @@ public abstract class MutableOfferDataModel extends OfferDataModel {
// called before activate() // called before activate()
public boolean initWithData(OfferDirection direction, TradeCurrency tradeCurrency) { public boolean initWithData(OfferDirection direction, TradeCurrency tradeCurrency) {
addressEntry = xmrWalletService.getOrCreateAddressEntry(offerId, XmrAddressEntry.Context.OFFER_FUNDING);
xmrBalanceListener = new XmrBalanceListener(getAddressEntry().getSubaddressIndex()) {
@Override
public void onBalanceChanged(BigInteger balance) {
updateBalance();
}
};
this.direction = direction; this.direction = direction;
this.tradeCurrency = tradeCurrency; this.tradeCurrency = tradeCurrency;

6
desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java
View File

@ -210,9 +210,6 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
paymentLabel = Res.get("createOffer.fundsBox.paymentLabel", dataModel.shortOfferId); paymentLabel = Res.get("createOffer.fundsBox.paymentLabel", dataModel.shortOfferId);
if (dataModel.getAddressEntry() != null) {
addressAsString = dataModel.getAddressEntry().getAddressString();
}
createListeners(); createListeners();
} }
@ -568,6 +565,9 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
boolean initWithData(OfferDirection direction, TradeCurrency tradeCurrency) { boolean initWithData(OfferDirection direction, TradeCurrency tradeCurrency) {
boolean result = dataModel.initWithData(direction, tradeCurrency); boolean result = dataModel.initWithData(direction, tradeCurrency);
if (dataModel.getAddressEntry() != null) {
addressAsString = dataModel.getAddressEntry().getAddressString();
}
if (dataModel.paymentAccount != null) if (dataModel.paymentAccount != null)
xmrValidator.setMaxValue(dataModel.paymentAccount.getPaymentMethod().getMaxTradeLimit(dataModel.getTradeCurrencyCode().get())); xmrValidator.setMaxValue(dataModel.paymentAccount.getPaymentMethod().getMaxTradeLimit(dataModel.getTradeCurrencyCode().get()));
xmrValidator.setMaxTradeLimit(BigInteger.valueOf(dataModel.getMaxTradeLimit())); xmrValidator.setMaxTradeLimit(BigInteger.valueOf(dataModel.getMaxTradeLimit()));