Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-06 21:48:30 -04:00
Code Packages Releases Activity

network: avoid dropping to legacy service when loading

Browse Source
This commit is contained in:
bbedward
2026-07-14 22:56:28 -04:00
parent 3c5245914f
commit 4af3225f21
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Services/NetworkService.qml
+24 -6
View File
@@ -100,14 +100,28 @@ Singleton {
readonly property string socketPath: Quickshell.env("DMS_SOCKET") readonly property string socketPath: Quickshell.env("DMS_SOCKET")
// Backend adoption must be state-checked here, not only edge-triggered below:
// with staged shell loading this singleton can be instantiated after
// DMSNetworkService already resolved its capabilities, so the change signal
// may never fire again.
Component.onCompleted: { Component.onCompleted: {
log.info("Initializing..."); log.info("Initializing...");
if (!socketPath || socketPath.length === 0) { if (!socketPath || socketPath.length === 0) {
log.info("DMS_SOCKET not set, using LegacyNetworkService"); log.info("DMS_SOCKET not set, using LegacyNetworkService");
useLegacyService(); useLegacyService();
} else { return;
log.debug("DMS_SOCKET found, waiting for capabilities...");
} }
if (DMSNetworkService.networkAvailable) {
log.info("Network capability already available, using DMSNetworkService");
useDMSService();
return;
}
if (DMSService.isConnected && DMSService.capabilities.length > 0) {
log.info("Network capability not available in DMS, using LegacyNetworkService");
useLegacyService();
return;
}
log.debug("DMS_SOCKET found, waiting for capabilities...");
} }
Connections { Connections {
@@ -116,10 +130,7 @@ Singleton {
function onNetworkAvailableChanged() { function onNetworkAvailableChanged() {
if (!activeService && DMSNetworkService.networkAvailable) { if (!activeService && DMSNetworkService.networkAvailable) {
log.info("Network capability detected, using DMSNetworkService"); log.info("Network capability detected, using DMSNetworkService");
activeService = DMSNetworkService; useDMSService();
usingLegacy = false;
log.info("Switched to DMSNetworkService, networkAvailable:", networkAvailable);
connectSignals();
} else if (!activeService && !DMSNetworkService.networkAvailable && socketPath && socketPath.length > 0) { } else if (!activeService && !DMSNetworkService.networkAvailable && socketPath && socketPath.length > 0) {
log.info("Network capability not available in DMS, using LegacyNetworkService"); log.info("Network capability not available in DMS, using LegacyNetworkService");
useLegacyService(); useLegacyService();
@@ -127,6 +138,13 @@ Singleton {
} }
} }
function useDMSService() {
activeService = DMSNetworkService;
usingLegacy = false;
log.info("Switched to DMSNetworkService, networkAvailable:", networkAvailable);
connectSignals();
}
function useLegacyService() { function useLegacyService() {
activeService = LegacyNetworkService; activeService = LegacyNetworkService;
usingLegacy = true; usingLegacy = true;