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

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

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-03 22:28:23 +02:00
parent cb3289f874
commit 794b1dc8e0
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/FlexibleKeyItemFactory.java
View File

@@ -58,6 +58,15 @@ public class FlexibleKeyItemFactory {
@NonNull
private String getHeaderText(UnifiedKeyInfo unifiedKeyInfo) {
String headerText = unifiedKeyInfo.name();
return headerText == null || headerText.isEmpty() ? "" : headerText.substring(0, 1).toUpperCase();
if (headerText == null || headerText.isEmpty()) {
headerText = unifiedKeyInfo.email();
}
if (headerText == null || headerText.isEmpty()) {
return "";
}
if (!Character.isLetter(headerText.codePointAt(0))) {
return "#";
}
return headerText.substring(0, 1).toUpperCase();
}
}

2
OpenKeychain/src/main/sqldelight/org/sufficientlysecure/keychain/Keys.sq
View File

@@ -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