cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always show revoked user ids last!

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-01-19 17:29:33 +01:00
parent 3752cdd132
commit e71bd3d9dd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@@ -716,6 +716,10 @@ public class ProviderHelper {
@Override @Override
public int compareTo(UserPacketItem o) { public int compareTo(UserPacketItem o) {
// revoked keys always come last!
if (isRevoked != o.isRevoked) {
return isRevoked ? 1 : -1;
}
// if one is a user id, but the other isn't, the user id always comes first. // if one is a user id, but the other isn't, the user id always comes first.
// we compare for null values here, so != is the correct operator! // we compare for null values here, so != is the correct operator!
// noinspection NumberEquality // noinspection NumberEquality
@@ -726,10 +730,6 @@ public class ProviderHelper {
if (isPrimary != o.isPrimary) { if (isPrimary != o.isPrimary) {
return isPrimary ? -1 : 1; return isPrimary ? -1 : 1;
} }
// revoked keys always come last!
if (isRevoked != o.isRevoked) {
return isRevoked ? 1 : -1;
}
return 0; return 0;
} }
} }