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

sort confirmed keys before unconfirmed primary ones (OKC-01-011)

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-09-11 03:56:07 +02:00
parent 476d153db2
commit 486117d9de
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -771,6 +771,11 @@ public class ProviderHelper {
if (type != o.type) { if (type != o.type) {
return type == null ? -1 : 1; return type == null ? -1 : 1;
} }
// if one is *trusted* but the other isn't, that one comes first
// this overrides the primary attribute, even!
if ( (trustedCerts.size() == 0) != (o.trustedCerts.size() == 0) ) {
return trustedCerts.size() > o.trustedCerts.size() ? -1 : 1;
}
// if one key is primary but the other isn't, the primary one always comes first // if one key is primary but the other isn't, the primary one always comes first
if (isPrimary != o.isPrimary) { if (isPrimary != o.isPrimary) {
return isPrimary ? -1 : 1; return isPrimary ? -1 : 1;