arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-23 07:58:09 +00:00
Code Issues Releases Wiki Activity

layout: split "First Last <first@last.com>" GPG user ID for readability

Browse Source
This commit is contained in:
Roman Zeyde 2016-11-26 21:16:15 +02:00 committed by Pavol Rusnak
parent 2dcef5cf04
commit 466155270b
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
firmware/layout2.c
View File

@ -305,10 +305,12 @@ void layoutSignIdentity(const IdentityType *identity, const char *challenge)
char row_hostport[64 + 6 + 1]; char row_hostport[64 + 6 + 1];
char row_user[64 + 8 + 1]; char row_user[64 + 8 + 1];
bool is_gpg = (strcmp(identity->proto, "gpg") == 0);
if (identity->has_proto && identity->proto[0]) { if (identity->has_proto && identity->proto[0]) {
if (strcmp(identity->proto, "https") == 0) { if (strcmp(identity->proto, "https") == 0) {
strlcpy(row_proto, "Web sign in to:", sizeof(row_proto)); strlcpy(row_proto, "Web sign in to:", sizeof(row_proto));
} else if (strcmp(identity->proto, "gpg") == 0) { } else if (is_gpg) {
strlcpy(row_proto, "GPG sign for:", sizeof(row_proto)); strlcpy(row_proto, "GPG sign for:", sizeof(row_proto));
} else { } else {
strlcpy(row_proto, identity->proto, sizeof(row_proto)); strlcpy(row_proto, identity->proto, sizeof(row_proto));
@ -337,6 +339,21 @@ void layoutSignIdentity(const IdentityType *identity, const char *challenge)
row_user[0] = 0; row_user[0] = 0;
} }
if (is_gpg) {
// Split "First Last <first@last.com>" into 2 lines:
// "First Last"
// "first@last.com"
char *email_start = strchr(row_hostport, '<');
if (email_start) {
strlcpy(row_user, email_start + 1, sizeof(row_user));
*email_start = 0;
char *email_end = strchr(row_user, '>');
if (email_end) {
*email_end = 0;
}
}
}
layoutDialogSwipe(&bmp_icon_question, "Cancel", "Confirm", layoutDialogSwipe(&bmp_icon_question, "Cancel", "Confirm",
"Do you want to sign in?", "Do you want to sign in?",
row_proto[0] ? row_proto : NULL, row_proto[0] ? row_proto : NULL,