From e44d1393f567d66dd4f4583730a620178a61d0dc Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Fri, 13 Sep 2024 13:13:49 +0200 Subject: [PATCH] delegate to wallet model usb support --- drongo | 2 +- .../java/com/sparrowwallet/sparrow/io/SpecterDesktop.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drongo b/drongo index 6b89a0c5..f8f50c0d 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 6b89a0c5ea7a63e1b410abe9963f20ce83763798 +Subproject commit f8f50c0dd907fac674ea363443b96772b6a0b658 diff --git a/src/main/java/com/sparrowwallet/sparrow/io/SpecterDesktop.java b/src/main/java/com/sparrowwallet/sparrow/io/SpecterDesktop.java index 1cf69a3d..adf085b3 100644 --- a/src/main/java/com/sparrowwallet/sparrow/io/SpecterDesktop.java +++ b/src/main/java/com/sparrowwallet/sparrow/io/SpecterDesktop.java @@ -108,9 +108,7 @@ public class SpecterDesktop implements WalletImport, WalletExport { WalletModel walletModel = device.getWalletModel(); if(walletModel != null) { keystore.setWalletModel(walletModel); - if(walletModel == WalletModel.TREZOR_1 || walletModel == WalletModel.TREZOR_T || walletModel == WalletModel.TREZOR_SAFE_3 || walletModel == WalletModel.TREZOR_SAFE_5 || - walletModel == WalletModel.LEDGER_NANO_S || walletModel == WalletModel.LEDGER_NANO_X || walletModel == WalletModel.LEDGER_NANO_S_PLUS || - walletModel == WalletModel.BITBOX_02 || walletModel == WalletModel.COLDCARD || walletModel == WalletModel.KEEPKEY) { + if(walletModel.hasUsb()) { keystore.setSource(KeystoreSource.HW_USB); } else if(walletModel == WalletModel.BITCOIN_CORE) { keystore.setSource(KeystoreSource.SW_WATCH);