diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-19 17:29:33 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-19 18:31:57 +0100 |
commit | e71bd3d9dd80d7f9721192238b9f30093c1c6bfc (patch) | |
tree | e5d2ab928e20a6c2c9c25a02b543e3ffd2a6a887 /OpenKeychain | |
parent | 3752cdd1322431143ce9c8fa4cba0c9fbf31a12c (diff) | |
download | open-keychain-e71bd3d9dd80d7f9721192238b9f30093c1c6bfc.tar.gz open-keychain-e71bd3d9dd80d7f9721192238b9f30093c1c6bfc.tar.bz2 open-keychain-e71bd3d9dd80d7f9721192238b9f30093c1c6bfc.zip |
always show revoked user ids last!
Diffstat (limited to 'OpenKeychain')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index c3990229d..b2af5a0a0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -716,6 +716,10 @@ public class ProviderHelper { @Override 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. // we compare for null values here, so != is the correct operator! // noinspection NumberEquality @@ -726,10 +730,6 @@ public class ProviderHelper { if (isPrimary != o.isPrimary) { return isPrimary ? -1 : 1; } - // revoked keys always come last! - if (isRevoked != o.isRevoked) { - return isRevoked ? 1 : -1; - } return 0; } } |