ensure /sys devices are writeable before calling udevadm

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'org.gradlex.extra-java-module-info' version '1.9'
 }
 
-def sparrowVersion = '2.1.0'
+def sparrowVersion = '2.1.1'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {

src/main/deploy/package/linux-headless/aarch64/control

@@ -1,5 +1,5 @@
 Package: sparrow
-Version: 2.1.0-1
+Version: 2.1.1-1
 Section: utils
 Maintainer: Craig Raw <mail@sparrowwallet.com>
 Priority: optional

src/main/deploy/package/linux-headless/x64/control

@@ -1,5 +1,5 @@
 Package: sparrow
-Version: 2.1.0-1
+Version: 2.1.1-1
 Section: utils
 Maintainer: Craig Raw <mail@sparrowwallet.com>
 Priority: optional

src/main/deploy/package/linux/postinst

@@ -31,7 +31,7 @@ case "$1" in
         if ! groups "${SUDO_USER:-$(whoami)}" | grep -q plugdev; then
             usermod -aG plugdev "${SUDO_USER:-$(whoami)}"
         fi
-        if [ -x /bin/udevadm ]; then
+        if [ -w /sys/devices ] && [ -w /sys/kernel/uevent_seqnum ] && [ -x /bin/udevadm ]; then
             /bin/udevadm control --reload
             /bin/udevadm trigger
         fi

src/main/deploy/package/linux/sparrow.spec

@@ -1,6 +1,6 @@
 Summary: Sparrow
 Name: sparrow
-Version: 2.1.0
+Version: 2.1.1
 Release: 1
 License: ASL 2.0
 Vendor: Unknown
@@ -86,7 +86,7 @@ fi
 if ! groups "${SUDO_USER:-$(whoami)}" | grep -q plugdev; then
     usermod -aG plugdev "${SUDO_USER:-$(whoami)}"
 fi
-if [ -x /bin/udevadm ]; then
+if [ -w /sys/devices ] && [ -w /sys/kernel/uevent_seqnum ] && [ -x /bin/udevadm ]; then
     /bin/udevadm control --reload
     /bin/udevadm trigger
 fi

src/main/deploy/package/osx/Info.plist

@@ -21,7 +21,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>2.1.0</string>
+  <string>2.1.1</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->

src/main/java/com/sparrowwallet/sparrow/SparrowWallet.java

@@ -18,7 +18,7 @@ import java.util.*;
 public class SparrowWallet {
     public static final String APP_ID = "sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "2.1.0";
+    public static final String APP_VERSION = "2.1.1";
     public static final String APP_VERSION_SUFFIX = "";
     public static final String APP_HOME_PROPERTY = "sparrow.home";
     public static final String NETWORK_ENV_PROPERTY = "SPARROW_NETWORK";

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

@@ -825,7 +825,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                         confirmationsListener.getConfirmationsProperty().unbind();
                     }
                 }
-                if(OsType.getCurrent() == OsType.MACOS && transactionEntry.getBlockTransaction().getHeight() > 0) {
+                if(OsType.getCurrent() == OsType.MACOS && transactionEntry.getBlockTransaction().getHeight() > 0 && !cell.getStyleClass().contains("label-cell")) {
                     cell.getStyleClass().add("number-field");
                 }
             } else if(entry instanceof NodeEntry) {
@@ -835,7 +835,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 if(!utxoEntry.isSpendable()) {
                     cell.getStyleClass().add("unspendable");
                 }
-                if(OsType.getCurrent() == OsType.MACOS && utxoEntry.getHashIndex().getHeight() > 0 && !addressCell) {
+                if(OsType.getCurrent() == OsType.MACOS && utxoEntry.getHashIndex().getHeight() > 0 && !addressCell && !cell.getStyleClass().contains("label-cell")) {
                     cell.getStyleClass().add("number-field");
                 }
             } else if(entry instanceof HashIndexEntry hashIndexEntry) {

src/main/java/com/sparrowwallet/sparrow/io/Hwi.java

@@ -54,7 +54,7 @@ public class Hwi {
             Lark lark = getLark(passphrase);
             isPromptActive = true;
             return lark.enumerate().stream().map(Device::fromHardwareClient).toList();
-        } catch(Exception e) {
+        } catch(Throwable e) {
             log.error("Error enumerating USB devices", e);
             throw new ImportException("Error scanning" + (e.getMessage() == null || e.getMessage().isEmpty() ? ", check devices are ready" : ": " + e.getMessage()), e);
         } finally {