software wallet import and airgapped fixes

drongo

@@ -1 +1 @@
-Subproject commit cbffaf3e416e0d94a01a9c00c99d9f2d61018d1e
+Subproject commit 019a3cf34f60da053ca7b5540e2bb7bcee6fbd50

src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java

@@ -57,11 +57,17 @@ public class DevicePane extends TitledPane {
         getStyleClass().add("devicepane");
         setDefaultStatus();
 
+        removeArrow();
+    }
+
+    private void removeArrow() {
         Platform.runLater(() -> {
             Node arrow = this.lookup(".arrow");
-            if(arrow != null) {
+            if (arrow != null) {
                 arrow.setVisible(false);
                 arrow.setManaged(false);
+            } else {
+                removeArrow();
             }
         });
     }

src/main/java/com/sparrowwallet/sparrow/control/KeystoreFileImportPane.java

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.google.gson.JsonParseException;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
@@ -42,11 +43,17 @@ public class KeystoreFileImportPane extends TitledPane {
         getStyleClass().add("importpane");
         setContent(getContentBox(importer.getKeystoreImportDescription()));
 
+        removeArrow();
+    }
+
+    private void removeArrow() {
         Platform.runLater(() -> {
             Node arrow = this.lookup(".arrow");
-            if(arrow != null) {
+            if (arrow != null) {
                 arrow.setVisible(false);
                 arrow.setManaged(false);
+            } else {
+                removeArrow();
             }
         });
     }
@@ -133,7 +140,14 @@ public class KeystoreFileImportPane extends TitledPane {
                 descriptionLabel.getStyleClass().remove("description-label");
                 descriptionLabel.getStyleClass().add("description-error");
                 descriptionLabel.setText("Error Importing [View Details...]");
-                setContent(getContentBox(e.getMessage()));
+                String errorMessage = e.getMessage();
+                if(e.getCause() != null) {
+                    errorMessage = e.getCause().getMessage();
+                }
+                if(e instanceof JsonParseException || e.getCause() instanceof JsonParseException) {
+                    errorMessage = "File was not in JSON format";
+                }
+                setContent(getContentBox(errorMessage));
             }
         }
     }
@@ -143,10 +157,14 @@ public class KeystoreFileImportPane extends TitledPane {
         details.setWrapText(true);
 
         HBox contentBox = new HBox();
-        contentBox.setAlignment(Pos.TOP_RIGHT);
+        contentBox.setAlignment(Pos.TOP_LEFT);
         contentBox.getChildren().add(details);
         contentBox.setPadding(new Insets(10, 30, 10, 30));
-        contentBox.setPrefHeight(60);
+
+        double width = TextUtils.computeTextWidth(details.getFont(), message, 0.0D);
+        double numLines = Math.max(1, width / 400);
+        double height = Math.max(60, numLines * 40);
+        contentBox.setPrefHeight(height);
 
         return contentBox;
     }

src/main/java/com/sparrowwallet/sparrow/control/KeystoreImportAccordion.java

@@ -21,7 +21,7 @@ public class KeystoreImportAccordion extends Accordion {
             if(importer instanceof KeystoreFileImport) {
                 importPane = new KeystoreFileImportPane(this, wallet, (KeystoreFileImport)importer);
             } else if(importer instanceof KeystoreMnemonicImport) {
-                //TODO:
+                //TODO: Import from the new Bip39KeystoreImport
             } else {
                 throw new IllegalArgumentException("Could not create ImportPane for importer of type " + importer.getClass());
             }

src/main/java/com/sparrowwallet/sparrow/external/Electrum.java

@@ -37,7 +37,7 @@ public class Electrum implements KeystoreFileImport, SinglesigWalletImport, Mult
 
     @Override
     public String getKeystoreImportDescription() {
-        return "Import from an Electrum wallet";
+        return "Import a single keystore from an Electrum wallet (use File > Import > Electrum to import a multisig wallet)";
     }
 
     @Override
@@ -45,12 +45,12 @@ public class Electrum implements KeystoreFileImport, SinglesigWalletImport, Mult
         Wallet wallet = importWallet(inputStream);
 
         if(!wallet.getPolicyType().equals(PolicyType.SINGLE) || wallet.getKeystores().size() != 1) {
-            throw new ImportException("Multisig wallet detected - import it through the File > Import menu");
+            throw new ImportException("Multisig wallet detected - import it using File > Import > Electrum");
         }
 
         if(!wallet.getScriptType().equals(scriptType)) {
-            //TODO: Derive appropriate ScriptType keystore
-            throw new ImportException("Wallet has an incompatible script type of " + wallet.getScriptType());
+            //TODO: Derive appropriate ScriptType keystore from xprv if present
+            throw new ImportException("Wallet has an incompatible script type of " + wallet.getScriptType() + ", and the correct script type cannot be derived without the master private key");
         }
 
         return wallet.getKeystores().get(0);
@@ -88,7 +88,7 @@ public class Electrum implements KeystoreFileImport, SinglesigWalletImport, Mult
                     keystore.setSource(KeystoreSource.HW_USB);
                     keystore.setWalletModel(WalletModel.fromType(ek.hw_type));
                     if(keystore.getWalletModel() == null) {
-                        throw new ImportException("Unknown hardware wallet type " + ek.hw_type);
+                        throw new ImportException("Wallet has keystore of unknown hardware wallet type \"" + ek.hw_type + "\"");
                     }
                 } else if("bip32".equals(ek.type)) {
                     if(ek.xprv != null) {

src/main/java/com/sparrowwallet/sparrow/keystoreimport/UsbAirgappedController.java → src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java

@@ -11,7 +11,7 @@ import javafx.fxml.FXML;
 import java.util.Collections;
 import java.util.List;
 
-public class UsbAirgappedController extends KeystoreImportDetailController {
+public class HwAirgappedController extends KeystoreImportDetailController {
     @FXML
     private KeystoreImportAccordion importAccordion;
 

src/main/java/com/sparrowwallet/sparrow/keystoreimport/UsbDevicesController.java → src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwUsbDevicesController.java

@@ -7,7 +7,7 @@ import javafx.fxml.FXML;
 
 import java.util.List;
 
-public class UsbDevicesController extends KeystoreImportDetailController {
+public class HwUsbDevicesController extends KeystoreImportDetailController {
     @FXML
     private DeviceAccordion deviceAccordion;
 

src/main/java/com/sparrowwallet/sparrow/keystoreimport/UsbScanController.java → src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwUsbScanController.java

@@ -9,7 +9,7 @@ import javafx.scene.control.Label;
 
 import java.util.List;
 
-public class UsbScanController extends KeystoreImportDetailController {
+public class HwUsbScanController extends KeystoreImportDetailController {
     @FXML
     private Label message;
 

src/main/java/com/sparrowwallet/sparrow/keystoreimport/KeystoreImportController.java

@@ -39,19 +39,23 @@ public class KeystoreImportController implements Initializable {
         importMenu.selectedToggleProperty().addListener((observable, oldValue, selectedToggle) -> {
             KeystoreSource importType = (KeystoreSource) selectedToggle.getUserData();
             System.out.println(importType);
-            setImportPane(importType.toString().toLowerCase());
+            String fxmlName = importType.toString().toLowerCase();
+            if(importType == KeystoreSource.SW_SEED || importType == KeystoreSource.SW_WATCH) {
+                fxmlName = "sw";
+            }
+            setImportPane(fxmlName);
         });
     }
 
     void showUsbDevices(List<Device> devices) {
         FXMLLoader loader = setImportPane("hw_usb-devices");
-        UsbDevicesController controller = loader.getController();
+        HwUsbDevicesController controller = loader.getController();
         controller.initializeView(devices);
     }
 
     void showUsbError(String message) {
         FXMLLoader loader = setImportPane("hw_usb-error");
-        UsbScanController controller = loader.getController();
+        HwUsbScanController controller = loader.getController();
         controller.initializeView(message);
     }
 

src/main/java/com/sparrowwallet/sparrow/keystoreimport/SwController.java

@@ -0,0 +1,19 @@
+package com.sparrowwallet.sparrow.keystoreimport;
+
+import com.sparrowwallet.sparrow.control.KeystoreImportAccordion;
+import com.sparrowwallet.sparrow.external.Electrum;
+import com.sparrowwallet.sparrow.external.KeystoreImport;
+import javafx.collections.FXCollections;
+import javafx.fxml.FXML;
+
+import java.util.List;
+
+public class SwController extends KeystoreImportDetailController {
+    @FXML
+    private KeystoreImportAccordion importAccordion;
+
+    public void initializeView() {
+        List<KeystoreImport> importers = List.of(new Electrum());
+        importAccordion.setKeystoreImporters(getMasterController().getWallet(), FXCollections.observableList(importers));
+    }
+}

src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_airgapped.fxml

@@ -8,7 +8,7 @@
 
 <?import com.sparrowwallet.sparrow.control.KeystoreImportAccordion?>
 
-<AnchorPane stylesheets="@keystoreimport.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.UsbAirgappedController">
+<AnchorPane stylesheets="@keystoreimport.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.HwAirgappedController">
     <ScrollPane AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" fitToWidth="true">
         <KeystoreImportAccordion fx:id="importAccordion" />
     </ScrollPane>

src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb-devices.fxml

@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 <?import com.sparrowwallet.sparrow.control.DeviceAccordion?>
 
-<AnchorPane stylesheets="@keystoreimport.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.UsbDevicesController">
+<AnchorPane stylesheets="@keystoreimport.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.HwUsbDevicesController">
         <ScrollPane AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" fitToWidth="true">
             <DeviceAccordion fx:id="deviceAccordion" />
         </ScrollPane>

src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb-error.fxml

@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 <?import org.controlsfx.glyphfont.Glyph?>
 
-<VBox alignment="CENTER" spacing="30" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.UsbScanController">
+<VBox alignment="CENTER" spacing="30" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.HwUsbScanController">
     <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="50" icon="EXCLAMATION_CIRCLE" />
     <Label text="There was error connecting to the wallet:" />
     <Label fx:id="message" />

src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb.fxml

@@ -10,7 +10,7 @@
 <?import javafx.scene.image.ImageView?>
 <?import org.controlsfx.glyphfont.Glyph?>
 
-<VBox alignment="CENTER" spacing="30" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.UsbScanController">
+<VBox alignment="CENTER" spacing="30" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.HwUsbScanController">
     <Glyph fontFamily="Font Awesome 5 Brands Regular" fontSize="50" icon="USB" />
     <Label fx:id="message" text="Connect Hardware Wallet" />
     <Button fx:id="scan" text="Scan..." wrapText="true" prefWidth="120" prefHeight="60" onAction="#scan"/>

src/main/resources/com/sparrowwallet/sparrow/keystoreimport/sw.fxml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import com.sparrowwallet.sparrow.control.KeystoreImportAccordion?>
+
+<AnchorPane stylesheets="@keystoreimport.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.SwController">
+    <ScrollPane AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" fitToWidth="true">
+        <KeystoreImportAccordion fx:id="importAccordion" />
+    </ScrollPane>
+</AnchorPane>