Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e9c6801 authored by Tao Bao's avatar Tao Bao
Browse files

recovery: Fix the bug that truncates menu entries. 

When there are 20 entries (like 10 last_log* and 10 last_kmg* in "view
recovery logs"), there's no "Back" entry. Because the number of entries
(21) exceeds text_rows (20) in WearRecoveryUI::StartMenu(). Since we
have scrollable menu, having more entries than text_rows won't be an
issue.

Bug: 23752519
Change-Id: I12573d7a34852a1a3d130c9e88522cee737eb08f
parent 337db14f

wear_ui.cpp

+6 −1
Original line number Diff line number Diff line
@@ -482,7 +482,12 @@ void WearRecoveryUI::StartMenu(const char* const * headers, const char* const * 
    if (text_rows > 0 && text_cols > 0) {

        menu_headers_ = headers;

        size_t i = 0;

        for (; i < text_rows && items[i] != nullptr; i++) {

        // "i < text_rows" is removed from the loop termination condition,

        // which is different from the one in ScreenRecoveryUI::StartMenu().

        // Because WearRecoveryUI supports scrollable menu, it's fine to have

        // more entries than text_rows. The menu may be truncated otherwise.

        // Bug: 23752519

        for (; items[i] != nullptr; i++) {

            strncpy(menu[i], items[i], text_cols - 1);

            menu[i][text_cols - 1] = '\0';

        }