From 5478ac05b80130ed5354f5b45800074d2c2007be Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Thu, 11 Mar 2021 11:39:19 +0200 Subject: [PATCH] show error when importing tpubs from usb on mainnet etc --- .../sparrow/control/DevicePane.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java b/src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java index 24dbe25f..042c8f19 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java @@ -442,14 +442,18 @@ public class DevicePane extends TitledDescriptionPane { getXpubService.setOnSucceeded(workerStateEvent -> { String xpub = getXpubService.getValue(); - Keystore keystore = new Keystore(); - keystore.setLabel(device.getModel().toDisplayString()); - keystore.setSource(KeystoreSource.HW_USB); - keystore.setWalletModel(device.getModel()); - keystore.setKeyDerivation(new KeyDerivation(device.getFingerprint(), derivationPath)); - keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(xpub)); - - EventManager.get().post(new KeystoreImportEvent(keystore)); + try { + Keystore keystore = new Keystore(); + keystore.setLabel(device.getModel().toDisplayString()); + keystore.setSource(KeystoreSource.HW_USB); + keystore.setWalletModel(device.getModel()); + keystore.setKeyDerivation(new KeyDerivation(device.getFingerprint(), derivationPath)); + keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(xpub)); + + EventManager.get().post(new KeystoreImportEvent(keystore)); + } catch(Exception e) { + setError("Could not retrieve xpub", e.getMessage()); + } }); getXpubService.setOnFailed(workerStateEvent -> { setError("Could not retrieve xpub", getXpubService.getException().getMessage());