Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 14:08:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix sonarcloud bugs

Browse Source
This commit is contained in:
Willy-JL
2023-01-20 21:14:59 +00:00
parent 36a2a6ef34
commit 88eb98dd9e
3 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
applications/main/u2f/views/u2f_view.c
View File

@@ -15,15 +15,13 @@ typedef struct {
static void u2f_view_draw_callback(Canvas* canvas, void* _model) { static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
U2fModel* model = _model; U2fModel* model = _model;
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
XtremeAssets* xtreme_assets = XTREME_ASSETS();
canvas_draw_icon(canvas, 8, 14, &I_Drive_112x35); canvas_draw_icon(canvas, 8, 14, &I_Drive_112x35);
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
if(model->display_msg == U2fMsgNotConnected) { if(model->display_msg == U2fMsgNotConnected) {
canvas_draw_icon(canvas, 22, 15, xtreme_assets->connect_me); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->connect_me);
if(xtreme_settings->sfw_mode) { if(XTREME_SETTINGS()->sfw_mode) {
canvas_draw_str_aligned( canvas_draw_str_aligned(
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect to a device"); canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect to a device");
} else { } else {
@@ -31,47 +29,43 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Plug me in d-daddy"); canvas, 128 / 2, 3, AlignCenter, AlignTop, "Plug me in d-daddy");
} }
} else if(model->display_msg == U2fMsgIdle) { } else if(model->display_msg == U2fMsgIdle) {
canvas_draw_icon(canvas, 22, 15, xtreme_assets->connected); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->connected);
if(xtreme_settings->sfw_mode) { canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!");
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!");
} else {
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connected!");
}
} else if(model->display_msg == U2fMsgRegister) { } else if(model->display_msg == U2fMsgRegister) {
if(xtreme_settings->sfw_mode) { if(XTREME_SETTINGS()->sfw_mode) {
elements_button_center(canvas, "OK"); elements_button_center(canvas, "OK");
canvas_draw_icon(canvas, 22, 15, xtreme_assets->authenticate); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate);
canvas_draw_str_aligned( canvas_draw_str_aligned(
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to register"); canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to register");
} else { } else {
elements_button_center(canvas, "CUM"); elements_button_center(canvas, "CUM");
canvas_draw_icon(canvas, 22, 15, xtreme_assets->authenticate); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate);
canvas_draw_str_aligned( canvas_draw_str_aligned(
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to register"); canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to register");
} }
} else if(model->display_msg == U2fMsgAuth) { } else if(model->display_msg == U2fMsgAuth) {
if(xtreme_settings->sfw_mode) { if(XTREME_SETTINGS()->sfw_mode) {
elements_button_center(canvas, "OK"); elements_button_center(canvas, "OK");
canvas_draw_icon(canvas, 22, 15, xtreme_assets->authenticate); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate);
canvas_draw_str_aligned( canvas_draw_str_aligned(
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to authenticate"); canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press OK to authenticate");
} else { } else {
elements_button_center(canvas, "CUM"); elements_button_center(canvas, "CUM");
canvas_draw_icon(canvas, 22, 15, xtreme_assets->authenticate); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->authenticate);
canvas_draw_str_aligned( canvas_draw_str_aligned(
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to authenticate"); canvas, 128 / 2, 3, AlignCenter, AlignTop, "Press CUM to authenticate");
} }
} else if(model->display_msg == U2fMsgSuccess) { } else if(model->display_msg == U2fMsgSuccess) {
canvas_draw_icon(canvas, 22, 15, xtreme_assets->connected); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->connected);
if(xtreme_settings->sfw_mode) { if(XTREME_SETTINGS()->sfw_mode) {
canvas_draw_str_aligned( canvas_draw_str_aligned(
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Authentication successful!"); canvas, 128 / 2, 3, AlignCenter, AlignTop, "Authentication successful!");
} else { } else {
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Cum released~"); canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Cum released~");
} }
} else if(model->display_msg == U2fMsgError) { } else if(model->display_msg == U2fMsgError) {
canvas_draw_icon(canvas, 22, 15, xtreme_assets->error); canvas_draw_icon(canvas, 22, 15, XTREME_ASSETS()->error);
if(xtreme_settings->sfw_mode) { if(XTREME_SETTINGS()->sfw_mode) {
canvas_draw_str_aligned( canvas_draw_str_aligned(
canvas, 128 / 2, 3, AlignCenter, AlignTop, "Certificate error"); canvas, 128 / 2, 3, AlignCenter, AlignTop, "Certificate error");
} else { } else {

2
applications/services/desktop/animations/animation_manager.c
View File

@@ -407,7 +407,7 @@ static StorageAnimation*
} }
} }
uint32_t lucky_number = furi_hal_random_get() % whole_weight; uint32_t lucky_number = furi_hal_random_get() % (whole_weight != 0 ? whole_weight : 1);
uint32_t weight = 0; uint32_t weight = 0;
StorageAnimation* selected = NULL; StorageAnimation* selected = NULL;

17
applications/services/desktop/animations/animation_storage.c
View File

@@ -32,23 +32,24 @@ static BubbleAnimation* animation_storage_load_animation(const char* name);
void animation_handler_select_manifest() { void animation_handler_select_manifest() {
XtremeSettings* xtreme_settings = XTREME_SETTINGS(); XtremeSettings* xtreme_settings = XTREME_SETTINGS();
FuriString* anim_dir = furi_string_alloc();
if (xtreme_settings->asset_pack[0] != '\0') { if (xtreme_settings->asset_pack[0] != '\0') {
snprintf(ANIMATION_DIR, sizeof(PACKS_DIR), "%s", PACKS_DIR); furi_string_printf(anim_dir, "%s/%s/Anims", PACKS_DIR, xtreme_settings->asset_pack);
FURI_LOG_I(TAG, "Custom Manifest selected"); FURI_LOG_I(TAG, "Custom Manifest selected");
strcat(ANIMATION_DIR, "/");
strcat(ANIMATION_DIR, xtreme_settings->asset_pack);
strcat(ANIMATION_DIR, "/Anims");
} else { } else {
snprintf(ANIMATION_DIR, sizeof(BASE_ANIMATION_DIR), "%s", BASE_ANIMATION_DIR); furi_string_cat_str(anim_dir, BASE_ANIMATION_DIR);
if(xtreme_settings->sfw_mode) { if(xtreme_settings->sfw_mode) {
furi_string_cat_str(anim_dir, "/sfw");
FURI_LOG_I(TAG, "SFW Manifest selected"); FURI_LOG_I(TAG, "SFW Manifest selected");
strcat(ANIMATION_DIR, "/sfw");
} else { } else {
furi_string_cat_str(anim_dir, "/nsfw");
FURI_LOG_I(TAG, "NSFW Manifest selected"); FURI_LOG_I(TAG, "NSFW Manifest selected");
strcat(ANIMATION_DIR, "/nsfw");
} }
} }
snprintf(ANIMATION_MANIFEST_FILE, sizeof(ANIMATION_MANIFEST_FILE), "%s/manifest.txt", ANIMATION_DIR); strlcpy(ANIMATION_DIR, furi_string_get_cstr(anim_dir), sizeof(ANIMATION_DIR));
furi_string_cat_str(anim_dir, "/manifest.txt");
strlcpy(ANIMATION_MANIFEST_FILE, furi_string_get_cstr(anim_dir), sizeof(ANIMATION_MANIFEST_FILE));
furi_string_free(anim_dir);
} }
static bool animation_storage_load_single_manifest_info( static bool animation_storage_load_single_manifest_info(