sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-04 21:36:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix keepkey hww

Browse source
This commit is contained in:
Craig Raw 2020-09-10 11:40:21 +02:00
parent 0c56f5a9a1
commit 4bc446724d
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drongo

@ -1 +1 @@
Subproject commit 9faacb055c635d22ce0dd7318f2b87814da85bcd Subproject commit db8ef9e4a1362671128c694c6b8068c6c9e620b6

2
src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java
View file

@ -258,7 +258,7 @@ public class DevicePane extends TitledDescriptionPane {
} }
private void unlock(Device device) { private void unlock(Device device) {
if(device.getModel().equals(WalletModel.TREZOR_1)) { if(device.getModel().requiresPinPrompt()) {
promptPin(); promptPin();
} }
} }

8
src/main/java/com/sparrowwallet/sparrow/io/Hwi.java
View file

@ -73,7 +73,7 @@ public class Hwi {
public String getXpub(Device device, String passphrase, String derivationPath) throws ImportException { public String getXpub(Device device, String passphrase, String derivationPath) throws ImportException {
try { try {
String output; String output;
if(passphrase != null && !passphrase.isEmpty() && device.getModel().equals(WalletModel.TREZOR_1)) { if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
output = execute(getDeviceCommand(device, passphrase, Command.GET_XPUB, derivationPath)); output = execute(getDeviceCommand(device, passphrase, Command.GET_XPUB, derivationPath));
} else { } else {
output = execute(getDeviceCommand(device, Command.GET_XPUB, derivationPath)); output = execute(getDeviceCommand(device, Command.GET_XPUB, derivationPath));
@ -106,7 +106,7 @@ public class Hwi {
isPromptActive = false; isPromptActive = false;
String output; String output;
if(passphrase != null && !passphrase.isEmpty() && device.getModel().equals(WalletModel.TREZOR_1)) { if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
output = execute(getDeviceCommand(device, passphrase, Command.DISPLAY_ADDRESS, "--path", derivationPath, type)); output = execute(getDeviceCommand(device, passphrase, Command.DISPLAY_ADDRESS, "--path", derivationPath, type));
} else { } else {
output = execute(getDeviceCommand(device, Command.DISPLAY_ADDRESS, "--path", derivationPath, type)); output = execute(getDeviceCommand(device, Command.DISPLAY_ADDRESS, "--path", derivationPath, type));
@ -132,7 +132,7 @@ public class Hwi {
try { try {
isPromptActive = false; isPromptActive = false;
String output; String output;
if(passphrase != null && !passphrase.isEmpty() && device.getModel().equals(WalletModel.TREZOR_1)) { if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
output = execute(getDeviceCommand(device, passphrase, Command.SIGN_MESSAGE, message, derivationPath)); output = execute(getDeviceCommand(device, passphrase, Command.SIGN_MESSAGE, message, derivationPath));
} else { } else {
output = execute(getDeviceCommand(device, Command.SIGN_MESSAGE, message, derivationPath)); output = execute(getDeviceCommand(device, Command.SIGN_MESSAGE, message, derivationPath));
@ -160,7 +160,7 @@ public class Hwi {
isPromptActive = true; isPromptActive = true;
String output; String output;
if(passphrase != null && !passphrase.isEmpty() && device.getModel().equals(WalletModel.TREZOR_1)) { if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
output = execute(getDeviceCommand(device, passphrase, Command.SIGN_TX, psbtBase64)); output = execute(getDeviceCommand(device, passphrase, Command.SIGN_TX, psbtBase64));
} else { } else {
output = execute(getDeviceCommand(device, Command.SIGN_TX, psbtBase64)); output = execute(getDeviceCommand(device, Command.SIGN_TX, psbtBase64));