From 8d75ca9a7b39b73d14921afc0054822f007f1b34 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Mon, 25 Sep 2023 01:14:48 -0400
Subject: [PATCH] Retain hotspot/tether: Fix initialization (#293)

* Retain hotspot/tether: Fix initialization

* init before manager starts

* simpler
---
 common/params.cc                      | 1 +
 selfdrive/manager/manager.py          | 6 +++---
 selfdrive/ui/qt/network/networking.cc | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/params.cc b/common/params.cc
index 448170d1f5..f661f1e7c1 100644
--- a/common/params.cc
+++ b/common/params.cc
@@ -255,6 +255,7 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"HideVEgoUi", PERSISTENT},
     {"HkgSmoothStop", PERSISTENT},
     {"HotspotOnBoot", PERSISTENT},
+    {"HotspotOnBootConfirmed", PERSISTENT},
     {"LastCarModel", PERSISTENT},
     {"LastSpeedLimitSignTap", PERSISTENT},
     {"LiveTorque", PERSISTENT},
diff --git a/selfdrive/manager/manager.py b/selfdrive/manager/manager.py
index 8f6f29d07a..471d3db828 100755
--- a/selfdrive/manager/manager.py
+++ b/selfdrive/manager/manager.py
@@ -267,6 +267,9 @@ def main() -> None:
   # SystemExit on sigterm
   signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit(1))
 
+  if Params().get_bool("HotspotOnBoot") and Params().get_bool("HotspotOnBootConfirmed"):
+    os.system('nmcli con up Hotspot')
+
   try:
     manager_thread()
   except Exception:
@@ -286,9 +289,6 @@ def main() -> None:
     cloudlog.warning("shutdown")
     HARDWARE.shutdown()
 
-  if params.get_bool("HotspotOnBoot"):
-    os.system('nmcli con up Hotspot')
-
 
 if __name__ == "__main__":
   unblock_stdout()
diff --git a/selfdrive/ui/qt/network/networking.cc b/selfdrive/ui/qt/network/networking.cc
index e7865b11a7..6d81e78410 100644
--- a/selfdrive/ui/qt/network/networking.cc
+++ b/selfdrive/ui/qt/network/networking.cc
@@ -201,7 +201,7 @@ void AdvancedNetworking::refresh() {
 }
 
 void AdvancedNetworking::toggleTethering(bool enabled) {
-  params.putBool("HotspotOnBoot", enabled);
+  params.putBool("HotspotOnBootConfirmed", enabled);
   wifi->setTetheringEnabled(enabled);
   tetheringToggle->setEnabled(false);
 }