diff options
| author | あく <alleteam@gmail.com> | 2021-07-02 18:12:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-02 18:12:05 +0300 |
| commit | 721f83dd836be30f8e7b3b45ee05acc88ff0430b (patch) | |
| tree | f5afd07fad38a4dbda5d4d6cb52d7fc0eb952b08 /applications/dolphin | |
| parent | 602c125ef5255ccd8563fe521401dc571e7a1327 (diff) | |
[FL-1516] Fix name read on device without OTP (#561)
* Fix name read on device without OTP
* Dolphin: proper name handling.
Diffstat (limited to 'applications/dolphin')
| -rw-r--r-- | applications/dolphin/dolphin_views.c | 6 | ||||
| -rw-r--r-- | applications/dolphin/passport/passport.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/applications/dolphin/dolphin_views.c b/applications/dolphin/dolphin_views.c index a140569d..f2a70569 100644 --- a/applications/dolphin/dolphin_views.c +++ b/applications/dolphin/dolphin_views.c @@ -15,6 +15,7 @@ void dolphin_view_first_start_draw(Canvas* canvas, void* model) { canvas_set_font(canvas, FontSecondary); uint8_t width = canvas_width(canvas); uint8_t height = canvas_height(canvas); + const char* my_name = api_hal_version_get_name_ptr(); if(m->page == 0) { canvas_draw_icon_name(canvas, 0, height - 48, I_DolphinFirstStart0_70x53); elements_multiline_text_framed(canvas, 75, 20, "Hey m8,\npress > to\ncontinue"); @@ -37,7 +38,7 @@ void dolphin_view_first_start_draw(Canvas* canvas, void* model) { 64, "%s %s%s", "I am", - api_hal_version_get_name_ptr(), + my_name ? my_name : "Unknown", ",\ncyberdolphin\nliving in your\npocket >"); canvas_draw_icon_name(canvas, 0, height - 48, I_DolphinFirstStart5_45x53); elements_multiline_text_framed(canvas, 60, 17, buf); @@ -119,6 +120,7 @@ void dolphin_view_idle_down_draw(Canvas* canvas, void* model) { if(m->screen != DolphinViewStatsMeta) { // Hardware version + const char* my_name = api_hal_version_get_name_ptr(); snprintf( buffer, sizeof(buffer), @@ -127,7 +129,7 @@ void dolphin_view_idle_down_draw(Canvas* canvas, void* model) { api_hal_version_get_hw_target(), api_hal_version_get_hw_body(), api_hal_version_get_hw_connect(), - api_hal_version_get_name_ptr()); + my_name ? my_name : "Unknown"); canvas_draw_str(canvas, 5, 23, buffer); ver = m->screen == DolphinViewStatsBoot ? api_hal_version_get_boot_version() : diff --git a/applications/dolphin/passport/passport.c b/applications/dolphin/passport/passport.c index c037d93f..c5803bee 100644 --- a/applications/dolphin/passport/passport.c +++ b/applications/dolphin/passport/passport.c @@ -80,7 +80,8 @@ static void render_callback(Canvas* canvas, void* ctx) { canvas_draw_line(canvas, 59, 31, 124, 31); canvas_draw_line(canvas, 59, 44, 124, 44); - canvas_draw_str(canvas, 59, 15, api_hal_version_get_name_ptr()); + const char* my_name = api_hal_version_get_name_ptr(); + canvas_draw_str(canvas, 59, 15, my_name ? my_name : "Unknown"); snprintf(level, 20, "Level: %ld", current_level); snprintf(mood, 20, "Mood: %s", mood_strings[butthurt]); |