From f77025056f771686c20df3762ccb2f98a86a21f2 Mon Sep 17 00:00:00 2001
From: Thomas Farstrike <thomasverstreken@protonmail.com>
Date: Wed, 4 Jun 2025 23:08:51 +0200
Subject: [PATCH] Fix WifiService

---
 .../com.micropythonos.wifi/assets/wifi.py     |  5 +-
 .../builtin/system/WifiService.py             | 64 ++++++-------------
 2 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/wifi.py b/internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/wifi.py
index 21ec98c5..0d26471c 100644
--- a/internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/wifi.py
+++ b/internal_filesystem/builtin/apps/com.micropythonos.wifi/assets/wifi.py
@@ -13,6 +13,7 @@ access_points={}
 last_tried_ssid = ""
 last_tried_result = ""
 
+# This is basically the wifi settings app
 class WiFi(Activity):
 
     scan_button_scan_text = "Rescan"
@@ -63,7 +64,7 @@ class WiFi(Activity):
 
     def onResume(self, screen):
         global access_points
-        access_points = mpos.config.SharedPreferences("com.micropythonos.wifi").get_dict("access_points")
+        access_points = mpos.config.SharedPreferences("com.micropythonos.system.wifiservice").get_dict("access_points")
         self.keep_running = True
         if len(self.ssids) == 0:
             self.start_scan_networks()
@@ -308,7 +309,7 @@ class PasswordPage(Activity):
         print(f"connect_cb: Got password: {password}")
         self.setPassword(self.selected_ssid, password)
         print(f"connect_cb: Updated access_points: {access_points}")
-        editor = mpos.config.SharedPreferences("com.micropythonos.wifi").edit()
+        editor = mpos.config.SharedPreferences("com.micropythonos.system.wifiservice").edit()
         editor.put_dict("access_points", access_points)
         editor.commit()
         self.setResult(True, {"ssid": self.selected_ssid, "password": password})
diff --git a/internal_filesystem/builtin/system/WifiService.py b/internal_filesystem/builtin/system/WifiService.py
index 0233c193..862969b1 100644
--- a/internal_filesystem/builtin/system/WifiService.py
+++ b/internal_filesystem/builtin/system/WifiService.py
@@ -1,45 +1,12 @@
 # Automatically connect to the WiFi, based on the saved networks
-
-have_network=True
-try:
-    import network
-except Exception as e:
-    have_network=False
-    print("Could not import network, have_network=False")
+# Manage concurrent accesses to the wifi (scan while connect, connect while scan etc)
+# Manage saved networks
+# This gets started in a new thread, does an autoconnect, and exits.
 
 import ujson
 import os
 import time
-
-
-access_points={}
-
-
-def load_config():
-    print("load_config: Checking for /data directory")
-    try:
-        os.stat('data')
-        print("load_config: /data exists")
-    except OSError:
-        print("load_config: Creating /data directory")
-        os.mkdir('data')
-    print("load_config: Checking for /data/com.example.wificonf directory")
-    try:
-        os.stat('data/com.example.wificonf')
-        print("load_config: /data/com.example.wificonf exists")
-    except OSError:
-        print("load_config: Creating /data/com.example.wificonf directory")
-        os.mkdir('data/com.example.wificonf')
-    print("load_config: Loading config from conf.json")
-    try:
-        with open('data/com.example.wificonf/conf.json','r') as f:
-            global access_points
-            access_points=ujson.load(f)
-            print(f"load_config: Loaded access_points: {access_points}")
-    except OSError:
-        access_points={}
-        print("load_config: No config file found, using empty access_points")
-
+import mpos.config
 
 def auto_connect():
     networks = wlan.scan()
@@ -47,7 +14,7 @@ def auto_connect():
         ssid = n[0].decode()
         print(f"auto_connect: checking ssid '{ssid}'")
         if ssid in access_points:
-            password = access_points.get(ssid)
+            password = access_points.get(ssid).get("password")
             print(f"auto_connect: attempting to connect to saved network {ssid} with password {password}")
             if attempt_connecting(ssid,password):
                 print(f"auto_connect: Connected to {ssid}")
@@ -92,19 +59,28 @@ def attempt_connecting(ssid,password):
         return False
 
 
-print("auto_connect.py running")
-load_config()
+print("WifiService.py running")
+
+have_network=True
+try:
+    import network
+except Exception as e:
+    have_network=False
+    print("Could not import network, have_network=False")
+
+# load config:
+access_points = mpos.config.SharedPreferences("com.micropythonos.system.wifiservice").get_dict("access_points")
 
 if not have_network:
-    print("auto_connect.py: no network module found, exiting...")
+    print("WifiService.py: no network module found, exiting...")
 elif len(access_points):
     wlan=network.WLAN(network.STA_IF)
     wlan.active(False) # restart WiFi hardware in case it's in a bad state
     wlan.active(True)
     if auto_connect():
-        print("auto_connect.py managed to connect.")
+        print("WifiService.py managed to connect.")
     else:
-        print("auto_connect.py did not manage to connect.")
+        print("WifiService.py did not manage to connect.")
         wlan.active(False) # disable to conserve power
 else:
-    print("auto_connect.py: not access points configured, exiting...")
+    print("WifiService.py: not access points configured, exiting...")