ui/network: simplify getActiveConnections (#32174)

1 year ago · 6de5e0d71a
parent 2bee28938a
commit 6de5e0d71a
1 changed files with 2 additions and 10 deletions
--- a/selfdrive/ui/qt/network/wifi_manager.cc
+++ b/selfdrive/ui/qt/network/wifi_manager.cc
@ -210,16 +210,8 @@ void WifiManager::deactivateConnection(const QDBusObjectPath &path) {
 }

 QVector<QDBusObjectPath> WifiManager::getActiveConnections() {
-  QVector<QDBusObjectPath> conns;
-  QDBusObjectPath path;
-  const QDBusArgument &arr = call<QDBusArgument>(NM_DBUS_PATH, NM_DBUS_INTERFACE_PROPERTIES, "Get", NM_DBUS_INTERFACE, "ActiveConnections");
-  arr.beginArray();
-  while (!arr.atEnd()) {
-    arr >> path;
-    conns.push_back(path);
-  }
-  arr.endArray();
-  return conns;
+  auto result = call<QDBusArgument>(NM_DBUS_PATH, NM_DBUS_INTERFACE_PROPERTIES, "Get", NM_DBUS_INTERFACE, "ActiveConnections");
+  return qdbus_cast<QVector<QDBusObjectPath>>(result);
 }

 bool WifiManager::isKnownConnection(const QString &ssid) {