Fixes for C3 LTE connection being deleted (#22129)

* Fix for LTE connection being deleted

* also fix newConnection

* simplify
pull/22163/head
Jason Young 4 years ago committed by GitHub
parent d5face26a8
commit 251a074b20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      selfdrive/ui/qt/offroad/wifiManager.cc

@ -303,7 +303,7 @@ QString WifiManager::getAdapter() {
void WifiManager::stateChange(unsigned int new_state, unsigned int previous_state, unsigned int change_reason) { void WifiManager::stateChange(unsigned int new_state, unsigned int previous_state, unsigned int change_reason) {
raw_adapter_state = new_state; raw_adapter_state = new_state;
if (new_state == NM_DEVICE_STATE_NEED_AUTH && change_reason == NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT) { if (new_state == NM_DEVICE_STATE_NEED_AUTH && change_reason == NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT && !connecting_to_network.isEmpty()) {
forgetConnection(connecting_to_network); forgetConnection(connecting_to_network);
emit wrongPassword(connecting_to_network); emit wrongPassword(connecting_to_network);
} else if (new_state == NM_DEVICE_STATE_ACTIVATED) { } else if (new_state == NM_DEVICE_STATE_ACTIVATED) {
@ -341,9 +341,12 @@ void WifiManager::connectionRemoved(const QDBusObjectPath &path) {
} }
void WifiManager::newConnection(const QDBusObjectPath &path) { void WifiManager::newConnection(const QDBusObjectPath &path) {
knownConnections[path] = getConnectionSettings(path).value("802-11-wireless").value("ssid").toString(); const Connection &settings = getConnectionSettings(path);
if (knownConnections[path] != tethering_ssid) { if (settings.value("connection").value("type") == "802-11-wireless") {
activateWifiConnection(knownConnections[path]); knownConnections[path] = settings.value("802-11-wireless").value("ssid").toString();
if (knownConnections[path] != tethering_ssid) {
activateWifiConnection(knownConnections[path]);
}
} }
} }

Loading…
Cancel
Save