sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

show info dialog when no new accounts are discovered

Browse source
This commit is contained in:
Craig Raw 2021-11-04 14:44:38 +02:00
parent 13a3ce23e7
commit af23f063f2
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java
View file

@ -484,6 +484,9 @@ public class SettingsController extends WalletFormController implements Initiali
ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(masterWallet, standardAccounts); ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(masterWallet, standardAccounts);
walletDiscoveryService.setOnSucceeded(event -> { walletDiscoveryService.setOnSucceeded(event -> {
addAndEncryptAccounts(masterWallet, walletDiscoveryService.getValue(), key); addAndEncryptAccounts(masterWallet, walletDiscoveryService.getValue(), key);
if(walletDiscoveryService.getValue().isEmpty()) {
AppServices.showAlertDialog("No Accounts Found", "No new accounts with existing transactions were found.", Alert.AlertType.INFORMATION, ButtonType.OK);
}
}); });
walletDiscoveryService.setOnFailed(event -> { walletDiscoveryService.setOnFailed(event -> {
log.error("Failed to discover accounts", event.getSource().getException()); log.error("Failed to discover accounts", event.getSource().getException());
@ -514,6 +517,9 @@ public class SettingsController extends WalletFormController implements Initiali
ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(masterWallet, standardAccounts); ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(masterWallet, standardAccounts);
walletDiscoveryService.setOnSucceeded(event -> { walletDiscoveryService.setOnSucceeded(event -> {
addAndSaveAccounts(masterWallet, walletDiscoveryService.getValue()); addAndSaveAccounts(masterWallet, walletDiscoveryService.getValue());
if(walletDiscoveryService.getValue().isEmpty()) {
AppServices.showAlertDialog("No Accounts Found", "No new accounts with existing transactions were found.", Alert.AlertType.INFORMATION, ButtonType.OK);
}
}); });
walletDiscoveryService.setOnFailed(event -> { walletDiscoveryService.setOnFailed(event -> {
log.error("Failed to discover accounts", event.getSource().getException()); log.error("Failed to discover accounts", event.getSource().getException());
@ -531,13 +537,17 @@ public class SettingsController extends WalletFormController implements Initiali
Optional<Map<StandardAccount, Keystore>> optDiscoveredKeystores = deviceKeystoreDiscoverDialog.showAndWait(); Optional<Map<StandardAccount, Keystore>> optDiscoveredKeystores = deviceKeystoreDiscoverDialog.showAndWait();
if(optDiscoveredKeystores.isPresent()) { if(optDiscoveredKeystores.isPresent()) {
Map<StandardAccount, Keystore> discoveredKeystores = optDiscoveredKeystores.get(); Map<StandardAccount, Keystore> discoveredKeystores = optDiscoveredKeystores.get();
for(Map.Entry<StandardAccount, Keystore> entry : discoveredKeystores.entrySet()) { if(discoveredKeystores.isEmpty()) {
Wallet childWallet = masterWallet.addChildWallet(entry.getKey()); AppServices.showAlertDialog("No Accounts Found", "No new accounts with existing transactions were found.", Alert.AlertType.INFORMATION, ButtonType.OK);
childWallet.getKeystores().clear(); } else {
childWallet.getKeystores().add(entry.getValue()); for(Map.Entry<StandardAccount, Keystore> entry : discoveredKeystores.entrySet()) {
EventManager.get().post(new ChildWalletAddedEvent(getWalletForm().getStorage(), masterWallet, childWallet)); Wallet childWallet = masterWallet.addChildWallet(entry.getKey());
childWallet.getKeystores().clear();
childWallet.getKeystores().add(entry.getValue());
EventManager.get().post(new ChildWalletAddedEvent(getWalletForm().getStorage(), masterWallet, childWallet));
}
saveChildWallets(masterWallet);
} }
saveChildWallets(masterWallet);
} }
} else { } else {
for(StandardAccount standardAccount : standardAccounts) { for(StandardAccount standardAccount : standardAccounts) {