emit refreshSignal in refreshNetworkds

commaai · Jan 8, 2022 · 79df9d0 · 79df9d0
1 parent a55c48f
commit 79df9d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 24 deletions.
diff --git a/selfdrive/ui/qt/offroad/networking.cc b/selfdrive/ui/qt/offroad/networking.cc
@@ -101,10 +101,7 @@ void Networking::wrongPassword(const QString &ssid) {
 
 void Networking::showEvent(QShowEvent* event) {
   // Wait to refresh to avoid delay when showing Networking widget
-  QTimer::singleShot(300, this, [=]() {
-    wifi->start();
-    refresh();
-  });
+  QTimer::singleShot(300, this, [this]() { wifi->start(); });
 }
 
 void Networking::hideEvent(QHideEvent* event) {

diff --git a/selfdrive/ui/qt/offroad/wifiManager.cc b/selfdrive/ui/qt/offroad/wifiManager.cc
@@ -39,8 +39,8 @@ void WifiManager::setup() {
   bus.connect(NM_DBUS_SERVICE, NM_DBUS_PATH_SETTINGS, NM_DBUS_INTERFACE_SETTINGS, "NewConnection", this, SLOT(newConnection(QDBusObjectPath)));
 
   raw_adapter_state = call<uint>(adapter, NM_DBUS_INTERFACE_PROPERTIES, "Get", NM_DBUS_INTERFACE_DEVICE, "State");
-
-  initActiveAp();
+  activeAp = call<QDBusObjectPath>(adapter, NM_DBUS_INTERFACE_PROPERTIES, "Get", NM_DBUS_INTERFACE_DEVICE_WIRELESS, "ActiveAccessPoint").path();
+
   initConnections();
   requestScan();
 }
@@ -71,6 +71,7 @@ void WifiManager::refreshNetworks() {
     }
     seenNetworks[ssid] = {ssid, strength, ctype, security};
   }
+  emit refreshSignal();
 }
 
 QString WifiManager::get_ipv4_address() {
@@ -179,18 +180,10 @@ uint WifiManager::getAdapterType(const QDBusObjectPath &path) {
   return call<uint>(path.path(), NM_DBUS_INTERFACE_PROPERTIES, "Get", NM_DBUS_INTERFACE_DEVICE, "DeviceType");
 }
 
-bool WifiManager::isWirelessAdapter(const QDBusObjectPath &path) {
-  return getAdapterType(path) == NM_DEVICE_TYPE_WIFI;
-}
-
 void WifiManager::requestScan() {
   call(adapter, NM_DBUS_INTERFACE_DEVICE_WIRELESS, "RequestScan", QVariantMap());
 }
 
-uint WifiManager::get_wifi_device_state() {
-  return call<uint>(adapter, NM_DBUS_INTERFACE_PROPERTIES, "Get", NM_DBUS_INTERFACE_DEVICE, "State");
-}
-
 QByteArray WifiManager::get_property(const QString &network_path , const QString &property) {
   return call<QByteArray>(network_path, NM_DBUS_INTERFACE_PROPERTIES, "Get", NM_DBUS_INTERFACE_ACCESS_POINT, property);
 }
@@ -218,7 +211,6 @@ void WifiManager::stateChange(unsigned int new_state, unsigned int previous_stat
     connecting_to_network = "";
     if (!stop_) {
       refreshNetworks();
-      emit refreshSignal();
     }
   }
 }
@@ -228,7 +220,6 @@ void WifiManager::propertyChange(const QString &interface, const QVariantMap &pr
   if (interface == NM_DBUS_INTERFACE_DEVICE_WIRELESS && props.contains("LastScan")) {
     if (!stop_ || firstScan) {
       refreshNetworks();
-      emit refreshSignal();
       firstScan = false;
     }
   } else if (interface == NM_DBUS_INTERFACE_DEVICE_WIRELESS && props.contains("ActiveAccessPoint")) {
@@ -237,7 +228,7 @@ void WifiManager::propertyChange(const QString &interface, const QVariantMap &pr
 }
 
 void WifiManager::deviceAdded(const QDBusObjectPath &path) {
-  if (isWirelessAdapter(path) && (adapter.isEmpty() || adapter == "/")) {
+  if (getAdapterType(path) == NM_DEVICE_TYPE_WIFI && (adapter.isEmpty() || adapter == "/")) {
     adapter = path.path();
     setup();
   }
@@ -391,10 +382,6 @@ void WifiManager::setTetheringEnabled(bool enabled) {
   }
 }
 
-void WifiManager::initActiveAp() {
-  activeAp = call<QDBusObjectPath>(adapter, NM_DBUS_INTERFACE_PROPERTIES, "Get", NM_DBUS_INTERFACE_DEVICE_WIRELESS, "ActiveAccessPoint").path();
-}
-
 bool WifiManager::isTetheringEnabled() {
   if (activeAp != "" && activeAp != "/") {
     return get_property(activeAp, "Ssid") == tethering_ssid;

diff --git a/selfdrive/ui/qt/offroad/wifiManager.h b/selfdrive/ui/qt/offroad/wifiManager.h
@@ -77,14 +77,11 @@ class WifiManager : public QObject {
   bool firstScan = true;
   QString getAdapter(const uint = NM_DEVICE_TYPE_WIFI);
   uint getAdapterType(const QDBusObjectPath &path);
-  bool isWirelessAdapter(const QDBusObjectPath &path);
   QString get_ipv4_address();
   QString activeAp;
-  void initActiveAp();
   void deactivateConnectionBySsid(const QString &ssid);
   void deactivateConnection(const QDBusObjectPath &path);
   QVector<QDBusObjectPath> get_active_connections();
-  uint get_wifi_device_state();
   QByteArray get_property(const QString &network_path, const QString &property);
   unsigned int get_ap_strength(const QString &network_path);
   SecurityType getSecurityType(const QString &path);