From e71bd3d9dd80d7f9721192238b9f30093c1c6bfc Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 19 Jan 2015 17:29:33 +0100
Subject: always show revoked user ids last!

---
 .../org/sufficientlysecure/keychain/provider/ProviderHelper.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')

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;
         }
     }
-- 
cgit v1.2.3