laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-08-09 00:04:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

treat whitespace-only labels as blank on label import and export

Browse Source
This commit is contained in:
Craig Raw
2026-07-29 13:04:58 +02:00
parent cf797ea0f4
commit 0dce4783ef
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java
+5 -4
View File
@@ -171,12 +171,12 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
feeRange.setFeeRate(AppServices.getDefaultFeeRate());
updateFeeRate();
Field useDustLimitField = new Field();
useDustLimitField.setText("Ignore dust:");
Field ignoreDustField = new Field();
ignoreDustField.setText("Ignore dust:");
ignoreDust = new UnlabeledToggleSwitch();
useDustLimitField.getInputs().add(ignoreDust);
ignoreDustField.getInputs().add(ignoreDust);
fieldset.getChildren().addAll(keyField, keyScriptTypeField, addressField, toAddressField, feeRangeField, feeRateField, useDustLimitField);
fieldset.getChildren().addAll(keyField, keyScriptTypeField, addressField, toAddressField, feeRangeField, feeRateField, ignoreDustField);
form.getChildren().add(fieldset);
dialogPane.setContent(form);
@@ -397,6 +397,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
return;
}
}
createTransaction(privateKey.getKey(), scriptType, utxos, payment);
});
addressUtxosService.setOnFailed(failedEvent -> {
src/main/java/com/sparrowwallet/sparrow/io/WalletLabels.java
+5 -5
View File
@@ -68,7 +68,7 @@ public class WalletLabels implements WalletImport, WalletExport {
String origin = outputDescriptor.toString(true, false, false);
for(Keystore keystore : exportWallet.getKeystores()) {
if(keystore.getLabel() != null && !keystore.getLabel().isEmpty()) {
if(keystore.getLabel() != null && !keystore.getLabel().isBlank()) {
if(exportWallet.getPolicyType() == PolicyType.SINGLE_SP && keystore.getSilentPaymentScanAddress() != null) {
labels.add(new Label(Type.spscan, keystore.getSilentPaymentScanAddress().toKeyString(), keystore.getLabel(), null, null));
} else if(keystore.getExtendedPublicKey() != null) {
@@ -186,10 +186,10 @@ public class WalletLabels implements WalletImport, WalletExport {
}
if(label.type == Type.output) {
if((label.label == null || label.label.isEmpty()) && label.spendable == null) {
if((label.label == null || label.label.isBlank()) && label.spendable == null) {
continue;
}
} else if(label.label == null || label.label.isEmpty()) {
} else if(label.label == null || label.label.isBlank()) {
continue;
}
@@ -276,7 +276,7 @@ public class WalletLabels implements WalletImport, WalletExport {
BlockTransactionHashIndex reference = txioEntry.getHashIndex();
if((label.type == Type.output && txioEntry.getType() == HashIndexEntry.Type.OUTPUT && reference.toString().equals(label.ref))
|| (label.type == Type.input && txioEntry.getType() == HashIndexEntry.Type.INPUT && reference.toString().equals(label.ref))) {
if(label.label != null && !label.label.isEmpty()) {
if(label.label != null && !label.label.isBlank()) {
reference.setLabel(label.label);
txioEntry.labelProperty().set(label.label);
addChangedEntry(changedWalletEntries, txioEntry);
@@ -332,7 +332,7 @@ public class WalletLabels implements WalletImport, WalletExport {
BlockTransactionHashIndex reference = hashIndexEntry.getHashIndex();
if((label.type == Type.output && hashIndexEntry.getType() == HashIndexEntry.Type.OUTPUT && reference.toString().equals(label.ref))
|| (label.type == Type.input && hashIndexEntry.getType() == HashIndexEntry.Type.INPUT && reference.toString().equals(label.ref))) {
if(label.label != null && !label.label.isEmpty()) {
if(label.label != null && !label.label.isBlank()) {
hashIndexEntry.labelProperty().set(label.label);
}
}