Jeremy Klein
151bf1dae4
PR #1908 silent-restarts on exit from any wifi-using activity to defuse LWIP/mbedTLS heap fragmentation, but two of the wifi-using paths slipped through that audit: KOReaderAuthActivity (Settings -> KOReader sync -> Authenticate) OtaUpdateActivity (Settings -> Check for update, back-out paths) Both used WiFi.disconnect + WiFi.mode(WIFI_OFF) on exit and returned control to Settings, leaving ~50KB of contiguous heap stranded for the rest of the session. Mirror the FontDownloadActivity pattern: if WiFi was activated, disconnect and silentRestart. OTA's success path is unchanged: SHUTTING_DOWN already calls plain ESP.restart() so the new firmware boots normally; only the cancel/fail/no-update back-out paths now go through silentRestart(). Did you use AI tools to help write this code? partial
110 lines
3.1 KiB
C++
110 lines
3.1 KiB
C++
#include "KOReaderAuthActivity.h"
|
|
|
|
#include <GfxRenderer.h>
|
|
#include <I18n.h>
|
|
#include <WiFi.h>
|
|
|
|
#include "KOReaderCredentialStore.h"
|
|
#include "KOReaderSyncClient.h"
|
|
#include "MappedInputManager.h"
|
|
#include "SilentRestart.h"
|
|
#include "activities/network/WifiSelectionActivity.h"
|
|
#include "components/UITheme.h"
|
|
#include "fontIds.h"
|
|
|
|
void KOReaderAuthActivity::onWifiSelectionComplete(const bool success) {
|
|
if (!success) {
|
|
{
|
|
RenderLock lock(*this);
|
|
state = FAILED;
|
|
errorMessage = tr(STR_WIFI_CONN_FAILED);
|
|
}
|
|
requestUpdate();
|
|
return;
|
|
}
|
|
|
|
{
|
|
RenderLock lock(*this);
|
|
state = AUTHENTICATING;
|
|
statusMessage = tr(STR_AUTHENTICATING);
|
|
}
|
|
requestUpdate();
|
|
|
|
performAuthentication();
|
|
}
|
|
|
|
void KOReaderAuthActivity::performAuthentication() {
|
|
const auto result = KOReaderSyncClient::authenticate();
|
|
|
|
{
|
|
RenderLock lock(*this);
|
|
if (result == KOReaderSyncClient::OK) {
|
|
state = SUCCESS;
|
|
statusMessage = tr(STR_AUTH_SUCCESS);
|
|
} else {
|
|
state = FAILED;
|
|
errorMessage = KOReaderSyncClient::errorString(result);
|
|
}
|
|
}
|
|
requestUpdate();
|
|
}
|
|
|
|
void KOReaderAuthActivity::onEnter() {
|
|
Activity::onEnter();
|
|
|
|
// Check if already connected
|
|
if (WiFi.status() == WL_CONNECTED) {
|
|
onWifiSelectionComplete(true);
|
|
return;
|
|
}
|
|
|
|
// Launch WiFi selection
|
|
startActivityForResult(std::make_unique<WifiSelectionActivity>(renderer, mappedInput),
|
|
[this](const ActivityResult& result) { onWifiSelectionComplete(!result.isCancelled); });
|
|
}
|
|
|
|
void KOReaderAuthActivity::onExit() {
|
|
Activity::onExit();
|
|
|
|
if (WiFi.getMode() != WIFI_MODE_NULL) {
|
|
WiFi.disconnect(false);
|
|
delay(30);
|
|
silentRestart();
|
|
}
|
|
}
|
|
|
|
void KOReaderAuthActivity::render(RenderLock&&) {
|
|
renderer.clearScreen();
|
|
|
|
const auto& metrics = UITheme::getInstance().getMetrics();
|
|
const auto pageWidth = renderer.getScreenWidth();
|
|
const auto pageHeight = renderer.getScreenHeight();
|
|
|
|
GUI.drawHeader(renderer, Rect{0, metrics.topPadding, pageWidth, metrics.headerHeight}, tr(STR_KOREADER_AUTH));
|
|
const auto height = renderer.getLineHeight(UI_10_FONT_ID);
|
|
const auto top = (pageHeight - height) / 2;
|
|
|
|
if (state == AUTHENTICATING) {
|
|
renderer.drawCenteredText(UI_10_FONT_ID, top, statusMessage.c_str());
|
|
} else if (state == SUCCESS) {
|
|
renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_AUTH_SUCCESS), true, EpdFontFamily::BOLD);
|
|
renderer.drawCenteredText(UI_10_FONT_ID, top + height + 10, tr(STR_SYNC_READY));
|
|
} else if (state == FAILED) {
|
|
renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_AUTH_FAILED), true, EpdFontFamily::BOLD);
|
|
renderer.drawCenteredText(UI_10_FONT_ID, top + height + 10, errorMessage.c_str());
|
|
}
|
|
|
|
const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
|
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
|
renderer.displayBuffer();
|
|
}
|
|
|
|
void KOReaderAuthActivity::loop() {
|
|
if (state == SUCCESS || state == FAILED) {
|
|
if (mappedInput.wasPressed(MappedInputManager::Button::Back) ||
|
|
mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
|
|
finish();
|
|
}
|
|
}
|
|
}
|