diff --git a/drongo b/drongo index 73eed3e2..74d2bfec 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 73eed3e292d6e3f91402fe024aede18b5a50a509 +Subproject commit 74d2bfec24204300392d7a750b6b010038fb9727 diff --git a/src/main/java/com/sparrowwallet/sparrow/io/Krux.java b/src/main/java/com/sparrowwallet/sparrow/io/Krux.java new file mode 100644 index 00000000..42ac3502 --- /dev/null +++ b/src/main/java/com/sparrowwallet/sparrow/io/Krux.java @@ -0,0 +1,25 @@ +package com.sparrowwallet.sparrow.io; + +import com.sparrowwallet.drongo.wallet.WalletModel; + +public class Krux extends SpecterDIY { + @Override + public String getName() { + return "Krux"; + } + + @Override + public String getKeystoreImportDescription(int account) { + return "Import QR created on your Krux by selecting Extended Public Key from the main menu once you have loaded your mnemonic."; + } + + @Override + public WalletModel getWalletModel() { + return WalletModel.KRUX; + } + + @Override + public boolean isFileFormatAvailable() { + return false; + } +} diff --git a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java index 0a1ec44f..4effeaf1 100644 --- a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java +++ b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java @@ -24,9 +24,9 @@ public class HwAirgappedController extends KeystoreImportDetailController { public void initializeView() { List fileImporters = Collections.emptyList(); if(getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE)) { - fileImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY()); + fileImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux()); } else if(getMasterController().getWallet().getPolicyType().equals(PolicyType.MULTI)) { - fileImporters = List.of(new Bip129(), new ColdcardMultisig(), new CoboVaultMultisig(), new Jade(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY()); + fileImporters = List.of(new Bip129(), new ColdcardMultisig(), new CoboVaultMultisig(), new Jade(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux()); } for(KeystoreFileImport importer : fileImporters) { diff --git a/src/main/resources/image/krux-icon-invert.svg b/src/main/resources/image/krux-icon-invert.svg new file mode 100644 index 00000000..cd06d9b2 --- /dev/null +++ b/src/main/resources/image/krux-icon-invert.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/main/resources/image/krux-icon.svg b/src/main/resources/image/krux-icon.svg new file mode 100644 index 00000000..40a60e81 --- /dev/null +++ b/src/main/resources/image/krux-icon.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/main/resources/image/krux.png b/src/main/resources/image/krux.png new file mode 100644 index 00000000..5c2a34f0 Binary files /dev/null and b/src/main/resources/image/krux.png differ diff --git a/src/main/resources/image/krux@2x.png b/src/main/resources/image/krux@2x.png new file mode 100644 index 00000000..d0f10c73 Binary files /dev/null and b/src/main/resources/image/krux@2x.png differ diff --git a/src/main/resources/image/krux@3x.png b/src/main/resources/image/krux@3x.png new file mode 100644 index 00000000..77d96c84 Binary files /dev/null and b/src/main/resources/image/krux@3x.png differ