From cb21668cb7986c23127138c0fb5ecd4d8aeb4c00 Mon Sep 17 00:00:00 2001
From: Justin Mitchell <justin@jmitch.com>
Date: Sun, 4 Jan 2026 00:46:02 -0500
Subject: [PATCH] Turn wifi off when exiting browser and wireless activities

---
 src/activities/browser/OpdsBookBrowserActivity.cpp | 3 +++
 src/activities/network/CalibreWirelessActivity.cpp | 3 +++
 src/main.cpp                                       | 2 --
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/activities/browser/OpdsBookBrowserActivity.cpp b/src/activities/browser/OpdsBookBrowserActivity.cpp
index 3c967eff..26858b9b 100644
--- a/src/activities/browser/OpdsBookBrowserActivity.cpp
+++ b/src/activities/browser/OpdsBookBrowserActivity.cpp
@@ -51,6 +51,9 @@ void OpdsBookBrowserActivity::onEnter() {
 void OpdsBookBrowserActivity::onExit() {
   Activity::onExit();
 
+  // Turn off WiFi when exiting
+  WiFi.mode(WIFI_OFF);
+
   xSemaphoreTake(renderingMutex, portMAX_DELAY);
   if (displayTaskHandle) {
     vTaskDelete(displayTaskHandle);
diff --git a/src/activities/network/CalibreWirelessActivity.cpp b/src/activities/network/CalibreWirelessActivity.cpp
index 6feaf6aa..ac2089ba 100644
--- a/src/activities/network/CalibreWirelessActivity.cpp
+++ b/src/activities/network/CalibreWirelessActivity.cpp
@@ -61,6 +61,9 @@ void CalibreWirelessActivity::onEnter() {
 void CalibreWirelessActivity::onExit() {
   Activity::onExit();
 
+  // Turn off WiFi when exiting
+  WiFi.mode(WIFI_OFF);
+
   // Stop UDP listening
   udp.stop();
 
diff --git a/src/main.cpp b/src/main.cpp
index 99c08151..34a14d74 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,7 +5,6 @@
 #include <InputManager.h>
 #include <SDCardManager.h>
 #include <SPI.h>
-#include <WiFi.h>
 #include <builtinFonts/all.h>
 
 #include <cstring>
@@ -23,7 +22,6 @@
 #include "activities/reader/ReaderActivity.h"
 #include "activities/settings/SettingsActivity.h"
 #include "activities/util/FullScreenMessageActivity.h"
-#include "activities/util/KeyboardEntryActivity.h"
 #include "fontIds.h"
 
 #define SPI_FQ 40000000