aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-01-14 14:52:29 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-01-14 14:52:29 +0100
commit4ad3c24126b33697ddedc2dffe5b3b4f62fab222 (patch)
tree1408f8d9614567528207758b1b462a7697ee11f6 /OpenKeychain
parentf397d4f995451850f25080d0f84c77ba2aaa4f9f (diff)
parent8ef104281b9e240e9f4598d5c0dbcef5f13fe477 (diff)
downloadopen-keychain-4ad3c24126b33697ddedc2dffe5b3b4f62fab222.tar.gz
open-keychain-4ad3c24126b33697ddedc2dffe5b3b4f62fab222.tar.bz2
open-keychain-4ad3c24126b33697ddedc2dffe5b3b4f62fab222.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedFragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedFragment.java
index 9c37f2d94..61bd126ce 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvancedFragment.java
@@ -80,7 +80,7 @@ public class ViewKeyAdvancedFragment extends LoaderFragment implements
static final String CERTS_SORT_ORDER =
KeychainDatabase.Tables.CERTS + "." + KeychainContract.Certs.RANK + " ASC, "
+ KeychainContract.Certs.VERIFIED + " DESC, "
- + KeychainContract.Certs.TYPE + " DESC, "
+ + KeychainDatabase.Tables.CERTS + "." + KeychainContract.Certs.TYPE + " DESC, "
+ KeychainContract.Certs.SIGNER_UID + " ASC";
/**