sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2024-12-25 09:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow short wallet display name retrieval

Browse source
This commit is contained in:
Craig Raw 2022-01-31 19:12:36 +02:00
parent 61317f15ac
commit 9618c73c50
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,7 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
return childWallets.isEmpty() ? name : name + "-" + (label != null && !label.isEmpty() ? label : getAutomaticName()); return childWallets.isEmpty() ? name : name + "-" + (label != null && !label.isEmpty() ? label : getAutomaticName());
} }
return getMasterWallet().getName() + "-" + getDisplayName(this); return getMasterWallet().getName() + "-" + getDisplayName();
} }
public String getFullDisplayName() { public String getFullDisplayName() {
@ -81,11 +81,11 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
return childWallets.isEmpty() ? name : name + " - " + (label != null && !label.isEmpty() ? label : getAutomaticName()); return childWallets.isEmpty() ? name : name + " - " + (label != null && !label.isEmpty() ? label : getAutomaticName());
} }
return getMasterWallet().getName() + " - " + getDisplayName(this); return getMasterWallet().getName() + " - " + getDisplayName();
} }
private String getDisplayName(Wallet wallet) { public String getDisplayName() {
return wallet.label != null && !wallet.label.isEmpty() ? wallet.label : wallet.name; return label != null && !label.isEmpty() ? label : (isMasterWallet() ? getAutomaticName() : name);
} }
public String getAutomaticName() { public String getAutomaticName() {