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

Group wallet init code

Browse source 
- Move filter code to CorruptedDatabaseFilesHandler.getCorruptedDatabaseFiles
- Add tradeManager.getSetOfAllTradeIds
This commit is contained in:
Manfred Karrer 2018-06-03 14:50:30 +02:00
parent eba5389348
commit d914eaab00
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
1 changed files with 22 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/main/java/bisq/desktop/main/MainViewModel.java
View file

@ -135,7 +135,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Random; import java.util.Random;
import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -624,13 +623,7 @@ public class MainViewModel implements ViewModel {
initTradeManager(); initTradeManager();
btcWalletService.addBalanceListener(new BalanceListener() { initWallet();
@Override
public void onBalanceChanged(Coin balance, Transaction tx) {
balanceModel.updateBalance();
}
});
balanceModel.updateBalance();
openOfferManager.getObservableList().addListener((ListChangeListener<OpenOffer>) c -> balanceModel.updateBalance()); openOfferManager.getObservableList().addListener((ListChangeListener<OpenOffer>) c -> balanceModel.updateBalance());
openOfferManager.onAllServicesInitialized(); openOfferManager.onAllServicesInitialized();
@ -690,12 +683,28 @@ public class MainViewModel implements ViewModel {
} }
}); });
corruptedDatabaseFilesHandler.getCorruptedDatabaseFiles().ifPresent(files -> {
new Popup<>()
.warning(Res.get("popup.warning.incompatibleDB", files.toString(), getAppDateDir()))
.useShutDownButton()
.show();
});
allBasicServicesInitialized = true;
}
private void initWallet() {
btcWalletService.addBalanceListener(new BalanceListener() {
@Override
public void onBalanceChanged(Coin balance, Transaction tx) {
balanceModel.updateBalance();
}
});
if (walletsSetup.downloadPercentageProperty().get() == 1) if (walletsSetup.downloadPercentageProperty().get() == 1)
checkForLockedUpFunds(); checkForLockedUpFunds();
checkForCorruptedDataBaseFiles(); balanceModel.updateBalance();
allBasicServicesInitialized = true;
} }
private void initTradeManager() { private void initTradeManager() {
@ -1070,23 +1079,9 @@ public class MainViewModel implements ViewModel {
} }
private void checkForLockedUpFunds() { private void checkForLockedUpFunds() {
Set<String> tradesIdSet = tradeManager.getLockedTradesStream()
.filter(Trade::hasFailed)
.map(Trade::getId)
.collect(Collectors.toSet());
tradesIdSet.addAll(failedTradesManager.getLockedTradesStream()
.map(Trade::getId)
.collect(Collectors.toSet()));
tradesIdSet.addAll(closedTradableManager.getLockedTradesStream()
.map(e -> {
log.warn("We found a closed trade with locked up funds. " +
"That should never happen. trade ID=" + e.getId());
return e.getId();
})
.collect(Collectors.toSet()));
btcWalletService.getAddressEntriesForTrade().stream() btcWalletService.getAddressEntriesForTrade().stream()
.filter(e -> tradesIdSet.contains(e.getOfferId()) && e.getContext() == AddressEntry.Context.MULTI_SIG) .filter(e -> tradeManager.getSetOfAllTradeIds().contains(e.getOfferId()) &&
e.getContext() == AddressEntry.Context.MULTI_SIG)
.forEach(e -> { .forEach(e -> {
final Coin balance = e.getCoinLockedInMultiSig(); final Coin balance = e.getCoinLockedInMultiSig();
final String message = Res.get("popup.warning.lockedUpFunds", final String message = Res.get("popup.warning.lockedUpFunds",
@ -1096,26 +1091,6 @@ public class MainViewModel implements ViewModel {
}); });
} }
private void checkForCorruptedDataBaseFiles() {
List<String> files = corruptedDatabaseFilesHandler.getCorruptedDatabaseFiles();
if (files.size() == 0)
return;
if (files.size() == 1 && files.get(0).equals("ViewPathAsString")) {
log.debug("We detected incompatible data base file for Navigation. " +
"That is a minor issue happening with refactoring of UI classes " +
"and we don't display a warning popup to the user.");
return;
}
// show warning that some files have been corrupted
new Popup<>()
.warning(Res.get("popup.warning.incompatibleDB", files.toString(), getAppDateDir()))
.useShutDownButton()
.show();
}
private void setupDevDummyPaymentAccounts() { private void setupDevDummyPaymentAccounts() {
if (user.getPaymentAccounts() != null && user.getPaymentAccounts().isEmpty()) { if (user.getPaymentAccounts() != null && user.getPaymentAccounts().isEmpty()) {
PerfectMoneyAccount perfectMoneyAccount = new PerfectMoneyAccount(); PerfectMoneyAccount perfectMoneyAccount = new PerfectMoneyAccount();