group non-letters in "#" group, display keys with only an address in-order

2018-07-03 22:28:23 +02:00
parent cb3289f874
commit 794b1dc8e0
2 changed files with 11 additions and 2 deletions
--- a/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/Keys.sq
+++ b/OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/Keys.sq
@@ -42,7 +42,7 @@ CREATE VIEW unifiedKeyView AS

 selectAllUnifiedKeyInfo:
 SELECT * FROM unifiedKeyView
-    ORDER BY has_any_secret_int DESC, name COLLATE NOCASE ASC, creation DESC;
+    ORDER BY has_any_secret_int DESC, IFNULL(name, email) COLLATE NOCASE ASC, creation DESC;

 selectUnifiedKeyInfoByMasterKeyId:
 SELECT * FROM unifiedKeyView