From d39246ee70b376eef49af8230e67a38ca581b4fd Mon Sep 17 00:00:00 2001 From: jpirnay Date: Fri, 17 Apr 2026 20:54:49 +0200 Subject: [PATCH] yaclf --- src/SettingsList.h | 28 ++++++------------- .../settings/KOReaderSettingsActivity.cpp | 15 +++++----- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/src/SettingsList.h b/src/SettingsList.h index 1e3be86d..e09fa64d 100644 --- a/src/SettingsList.h +++ b/src/SettingsList.h @@ -34,21 +34,13 @@ // deep inside the heap allocator chain — enough stack to overflow the 8 KB loop task stack // when called from inside SETTINGS.loadFromFile() at boot time. namespace SettingsListDetail { -inline uint8_t getKoReaderMatchMethod(const void*) { - return static_cast(KOREADER_STORE.getMatchMethod()); -} +inline uint8_t getKoReaderMatchMethod(const void*) { return static_cast(KOREADER_STORE.getMatchMethod()); } -inline std::string getKoReaderServerUrl(void*) { - return KOREADER_STORE.getServerUrl(); -} +inline std::string getKoReaderServerUrl(void*) { return KOREADER_STORE.getServerUrl(); } -inline std::string getKoReaderUsername(void*) { - return KOREADER_STORE.getUsername(); -} +inline std::string getKoReaderUsername(void*) { return KOREADER_STORE.getUsername(); } -inline std::string getKoReaderPassword(void*) { - return KOREADER_STORE.getPassword(); -} +inline std::string getKoReaderPassword(void*) { return KOREADER_STORE.getPassword(); } inline const std::vector list = { // --- Display --- @@ -167,24 +159,21 @@ inline const std::vector list = { // --- KOReader Sync (web-only, uses KOReaderCredentialStore) --- SettingInfo::DynamicString( - StrId::STR_SYNC_SERVER_URL, - static_cast(getKoReaderServerUrl), + StrId::STR_SYNC_SERVER_URL, static_cast(getKoReaderServerUrl), [](void*, const std::string& v) { KOREADER_STORE.setServerUrl(v); KOREADER_STORE.saveToFile(); }, "koServerUrl", StrId::STR_KOREADER_SYNC), SettingInfo::DynamicString( - StrId::STR_KOREADER_USERNAME, - static_cast(getKoReaderUsername), + StrId::STR_KOREADER_USERNAME, static_cast(getKoReaderUsername), [](void*, const std::string& v) { KOREADER_STORE.setCredentials(v, KOREADER_STORE.getPassword()); KOREADER_STORE.saveToFile(); }, "koUsername", StrId::STR_KOREADER_SYNC), SettingInfo::DynamicString( - StrId::STR_KOREADER_PASSWORD, - static_cast(getKoReaderPassword), + StrId::STR_KOREADER_PASSWORD, static_cast(getKoReaderPassword), [](void*, const std::string& v) { KOREADER_STORE.setCredentials(KOREADER_STORE.getUsername(), v); KOREADER_STORE.saveToFile(); @@ -192,8 +181,7 @@ inline const std::vector list = { "koPassword", StrId::STR_KOREADER_SYNC) .withObfuscated(), SettingInfo::DynamicEnum( - StrId::STR_DOCUMENT_MATCHING, {StrId::STR_FILENAME, StrId::STR_BINARY}, - getKoReaderMatchMethod, + StrId::STR_DOCUMENT_MATCHING, {StrId::STR_FILENAME, StrId::STR_BINARY}, getKoReaderMatchMethod, [](void*, uint8_t v) { KOREADER_STORE.setMatchMethod(static_cast(v)); KOREADER_STORE.saveToFile(); diff --git a/src/activities/settings/KOReaderSettingsActivity.cpp b/src/activities/settings/KOReaderSettingsActivity.cpp index 0c82424b..2681be27 100644 --- a/src/activities/settings/KOReaderSettingsActivity.cpp +++ b/src/activities/settings/KOReaderSettingsActivity.cpp @@ -24,13 +24,14 @@ void KOReaderSettingsActivity::buildMenuItems() { menuItems.push_back(SettingInfo::Action(StrId::STR_PASSWORD, SettingAction::None)); // Document matching: DynamicEnum toggling between Filename and Binary - menuItems.push_back(SettingInfo::DynamicEnum( - StrId::STR_DOCUMENT_MATCHING, {StrId::STR_FILENAME, StrId::STR_BINARY}, - static_cast([](const void*) -> uint8_t { return static_cast(KOREADER_STORE.getMatchMethod()); }), - [](void*, uint8_t v) { - KOREADER_STORE.setMatchMethod(static_cast(v)); - KOREADER_STORE.saveToFile(); - })); + menuItems.push_back(SettingInfo::DynamicEnum(StrId::STR_DOCUMENT_MATCHING, {StrId::STR_FILENAME, StrId::STR_BINARY}, + static_cast([](const void*) -> uint8_t { + return static_cast(KOREADER_STORE.getMatchMethod()); + }), + [](void*, uint8_t v) { + KOREADER_STORE.setMatchMethod(static_cast(v)); + KOREADER_STORE.saveToFile(); + })); // Authenticate and Register: ACTION items menuItems.push_back(