Merge pull request #1234 from michaelschattgen/feature/issuer-sort-account-fallback

Improve issuer and account sorting
This commit is contained in:
Alexander Bakker 2023-11-29 23:24:19 +01:00 committed by GitHub
commit adaae9e6d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -31,16 +31,16 @@ public enum SortCategory {
switch (this) { switch (this) {
case ACCOUNT: case ACCOUNT:
comparator = new AccountNameComparator(); comparator = new AccountNameComparator().thenComparing(new IssuerNameComparator());
break; break;
case ACCOUNT_REVERSED: case ACCOUNT_REVERSED:
comparator = Collections.reverseOrder(new AccountNameComparator()); comparator = Collections.reverseOrder(new AccountNameComparator().thenComparing(new IssuerNameComparator()));
break; break;
case ISSUER: case ISSUER:
comparator = new IssuerNameComparator(); comparator = new IssuerNameComparator().thenComparing(new AccountNameComparator());
break; break;
case ISSUER_REVERSED: case ISSUER_REVERSED:
comparator = Collections.reverseOrder(new IssuerNameComparator()); comparator = Collections.reverseOrder(new IssuerNameComparator().thenComparing(new AccountNameComparator()));
break; break;
case USAGE_COUNT: case USAGE_COUNT:
comparator = Collections.reverseOrder(new UsageCountComparator()); comparator = Collections.reverseOrder(new UsageCountComparator());