From 0b7cad79186583a0a46dcacf3f5f092c346e5820 Mon Sep 17 00:00:00 2001 From: jbohack Date: Fri, 30 Dec 2022 18:03:08 -0500 Subject: [PATCH] added new U2F messages --- applications/main/u2f/views/u2f_view.c | 27 +++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/applications/main/u2f/views/u2f_view.c b/applications/main/u2f/views/u2f_view.c index f5f50a02f..4f5d382d5 100644 --- a/applications/main/u2f/views/u2f_view.c +++ b/applications/main/u2f/views/u2f_view.c @@ -25,61 +25,66 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) { if (model->display_msg == U2fMsgNotConnected) { if (settings->sfw_mode) { canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31_sfw); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect me to computer"); } else { canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Plug me in d-daddy"); } - canvas_draw_str_aligned( - canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect me to computer"); } else if (model->display_msg == U2fMsgIdle) { if (settings->sfw_mode) { canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31_sfw); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!"); } else { canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!"); } - canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!"); } else if (model->display_msg == U2fMsgRegister) { - elements_button_center(canvas, "OK"); if (settings->sfw_mode) { + elements_button_center(canvas, "OK"); canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31_sfw); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to register"); } else { + elements_button_center(canvas, "CUM"); canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to register"); } - canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to register"); } else if (model->display_msg == U2fMsgAuth) { - elements_button_center(canvas, "OK"); if (settings->sfw_mode) { + elements_button_center(canvas, "OK"); canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31_sfw); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to authenticate"); } else { + elements_button_center(canvas, "CUM"); canvas_draw_icon(canvas, 22, 15, &I_Auth_62x31); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to authenticate"); } - canvas_draw_str_aligned( - canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to authenticate"); } else if (model->display_msg == U2fMsgSuccess) { if (settings->sfw_mode) { canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31_sfw); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Authentication successful!"); } else { canvas_draw_icon(canvas, 22, 15, &I_Connected_62x31); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Cum released~"); } - canvas_draw_str_aligned( - canvas, 128 / 2, 3, AlignCenter, AlignTop, "Authentication successful!"); } else if (model->display_msg == U2fMsgError) { if (settings->sfw_mode) { canvas_draw_icon(canvas, 22, 15, &I_Error_62x31_sfw); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Certificate error"); } else { canvas_draw_icon(canvas, 22, 15, &I_Error_62x31); + canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Unable to cum"); } - canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Certificate error"); } free(settings); }