Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-06 05:25:41 -05:00
Code Packages Releases Activity

Merge branch 'master' of github.com:bbedward/DankMaterialShell

Browse Source
This commit is contained in:
bbedward
2025-08-19 19:05:22 -04:00
parent c9adb8faa3 64e8a81015
commit 0d775f370b
1 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Services/NetworkService.qml
View File

@@ -351,6 +351,15 @@ Singleton {
if (root.wifiConnected) {
getWifiIP.running = true
getCurrentWifiInfo.running = true
// Ensure SSID is resolved even if scan output lacks ACTIVE marker
if (root.currentWifiSSID === "") {
if (root.wifiConnectionUuid) {
resolveWifiSSID.running = true
}
if (root.wifiInterface) {
resolveWifiSSIDFromDevice.running = true
}
}
} else {
root.wifiIP = ""
root.currentWifiSSID = ""
@@ -426,6 +435,42 @@ Singleton {
root.wifiConnectionUuid = uuid
}
}
}
}
}
}
// Resolve SSID from active WiFi connection UUID when scans don't mark any row as ACTIVE.
Process {
id: resolveWifiSSID
command: root.wifiConnectionUuid ? [
"nmcli", "-g", "802-11-wireless.ssid", "connection", "show", "uuid", root.wifiConnectionUuid
] : []
running: false
stdout: StdioCollector {
onStreamFinished: {
const ssid = text.trim()
if (ssid) {
root.currentWifiSSID = ssid
}
}
}
}
// Fallback 2: Resolve SSID from device info (GENERAL.CONNECTION usually matches SSID for WiFi)
Process {
id: resolveWifiSSIDFromDevice
command: root.wifiInterface ? [
"nmcli", "-t", "-f", "GENERAL.CONNECTION", "device", "show", root.wifiInterface
] : []
running: false
stdout: StdioCollector {
onStreamFinished: {
if (!root.currentWifiSSID) {
const name = text.trim()
if (name) root.currentWifiSSID = name
}
}
}
@@ -968,4 +1013,4 @@ Singleton {
bssid: network.bssid
}
}
}
}