From 65edbe4f47c0a00fa6b79b904dbcecdcb2acf8b1 Mon Sep 17 00:00:00 2001
From: DevTekVE <devtekve@gmail.com>
Date: Sun, 16 Jun 2024 20:51:06 +0200
Subject: [PATCH] Update Sunnylink dongle ID handling

The Sunnylink dongle ID is now being formatted directly in the manager.py file, reducing redundancy. Also, the check for sunnylink_dongle_id in sunnylink.py was removed to simplify the SunnlinkEnabled conditional.
---
 common/api/sunnylink.py   | 3 +--
 system/manager/manager.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/api/sunnylink.py b/common/api/sunnylink.py
index fe8627ceab..e2761cc29f 100644
--- a/common/api/sunnylink.py
+++ b/common/api/sunnylink.py
@@ -23,8 +23,7 @@ class SunnylinkApi(BaseApi):
     self.params = Params()
 
   def api_get(self, endpoint, method='GET', timeout=10, access_token=None, **kwargs):
-    sunnylink_dongle_id, comma_dongle_id = self._resolve_dongle_ids()
-    if not self.params.get_bool("SunnylinkEnabled") or sunnylink_dongle_id in (None, UNREGISTERED_SUNNYLINK_DONGLE_ID):
+    if not self.params.get_bool("SunnylinkEnabled"):
       return None
 
     return super().api_get(endpoint, method, timeout, access_token, **kwargs)
diff --git a/system/manager/manager.py b/system/manager/manager.py
index 33ebcd73e6..3155d28da3 100755
--- a/system/manager/manager.py
+++ b/system/manager/manager.py
@@ -107,7 +107,7 @@ def manager_init() -> None:
     ("OSMDownloadProgress", "{}"),
     ("SidebarTemperatureOptions", "0"),
     ("SunnylinkEnabled", "1"),
-    {"SunnylinkDongleId", UNREGISTERED_SUNNYLINK_DONGLE_ID},
+    {"SunnylinkDongleId", f"{UNREGISTERED_SUNNYLINK_DONGLE_ID}"},
     ("CustomDrivingModel", "0"),
     ("DrivingModelGeneration", "4"),
     ("LastSunnylinkPingTime", "0"),