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

more nuanced wallet compare with master wallets first

Browse source
This commit is contained in:
Craig Raw 2022-01-25 13:46:02 +01:00
parent fe61c633ae
commit 61317f15ac
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1534,11 +1534,31 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
@Override @Override
public int compareTo(Wallet other) { public int compareTo(Wallet other) {
if(getStandardAccountType() != null && other.getStandardAccountType() != null) { if(isMasterWallet() && !other.isMasterWallet()) {
return getStandardAccountType().ordinal() - other.getStandardAccountType().ordinal(); return -1;
} }
return getAccountIndex() - other.getAccountIndex(); if(!isMasterWallet() && other.isMasterWallet()) {
return 1;
}
if(getStandardAccountType() != null && other.getStandardAccountType() != null) {
int standardAccountDiff = getStandardAccountType().ordinal() - other.getStandardAccountType().ordinal();
if(standardAccountDiff != 0) {
return standardAccountDiff;
}
}
int accountIndexDiff = getAccountIndex() - other.getAccountIndex();
if(accountIndexDiff != 0) {
return accountIndexDiff;
}
if(name != null && other.name != null) {
return name.compareTo(other.name);
}
return 0;
} }
@Override @Override