sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2025-11-05 11:56:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve support for keystore relabelling

Browse source
This commit is contained in:
Craig Raw 2025-02-13 08:42:07 +02:00
parent f7d5b4fb8f
commit 419ed1a699
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/sparrowwallet/drongo/wallet/Keystore.java
View file

@ -51,6 +51,9 @@ public class Keystore extends Persistable {
} }
public String getBaseLabel() { public String getBaseLabel() {
if(walletModel != null && label.startsWith(walletModel.toDisplayString()) && label.substring(walletModel.toDisplayString().length()).matches("( \\d*)?$")) {
return walletModel.toDisplayString();
}
return label.replaceAll(" \\d*$", ""); return label.replaceAll(" \\d*$", "");
} }

16
src/main/java/com/sparrowwallet/drongo/wallet/Wallet.java
View file

@ -1851,22 +1851,28 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
return !keystores.stream().map(Keystore::getExtendedPublicKey).allMatch(new HashSet<>()::add); return !keystores.stream().map(Keystore::getExtendedPublicKey).allMatch(new HashSet<>()::add);
} }
public void makeLabelsUnique(Keystore newKeystore) { public List<Keystore> makeLabelsUnique(Keystore newKeystore) {
List<Keystore> changedKeystores = new ArrayList<>();
Set<String> labels = getKeystores().stream().map(Keystore::getBaseLabel).collect(Collectors.toSet()); Set<String> labels = getKeystores().stream().map(Keystore::getBaseLabel).collect(Collectors.toSet());
if(!labels.add(newKeystore.getBaseLabel())) { if(!labels.add(newKeystore.getBaseLabel())) {
makeLabelsUnique(newKeystore, false); makeLabelsUnique(newKeystore, false, changedKeystores);
} }
return changedKeystores;
} }
private int makeLabelsUnique(Keystore newKeystore, boolean duplicateFound) { private int makeLabelsUnique(Keystore newKeystore, boolean duplicateFound, List<Keystore> changedKeystores) {
int max = 0; int max = 0;
for(Keystore keystore : getKeystores()) { for(Keystore keystore : getKeystores()) {
String newKeystoreLabel = newKeystore.getLabel().equals(Keystore.DEFAULT_LABEL) ? Keystore.DEFAULT_LABEL.substring(0, Keystore.DEFAULT_LABEL.length() - 2) : newKeystore.getLabel(); String newKeystoreLabel = newKeystore.getLabel().equals(Keystore.DEFAULT_LABEL) ? Keystore.DEFAULT_LABEL.substring(0, Keystore.DEFAULT_LABEL.length() - 2) : newKeystore.getLabel();
if(newKeystore != keystore && keystore.getLabel().startsWith(newKeystoreLabel)) { if(newKeystore != keystore && keystore.getLabel().startsWith(newKeystoreLabel)) {
duplicateFound = true; duplicateFound = true;
String remainder = keystore.getLabel().substring(newKeystoreLabel.length()); String remainder = keystore.getLabel().substring(newKeystoreLabel.length());
if(remainder.length() == 0) { if(remainder.isEmpty()) {
max = makeLabelsUnique(keystore, true); String existingLabel = keystore.getLabel();
max = makeLabelsUnique(keystore, true, changedKeystores);
if(!keystore.getLabel().equals(existingLabel)) {
changedKeystores.add(keystore);
}
} else { } else {
try { try {
int count = Integer.parseInt(remainder.trim()); int count = Integer.parseInt(remainder.trim());