From a2caf11b9f115629e1db4e4dadb0162c677f2a56 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Sat, 15 Jan 2022 00:42:29 +0800
Subject: [PATCH] ui/networking: combine connect functions into one (#23522)

old-commit-hash: 39d904d2aa4bff1ecbbe5952851177fbdc0125e8
---
 selfdrive/ui/qt/offroad/wifiManager.cc | 24 ++++++------------------
 selfdrive/ui/qt/offroad/wifiManager.h  |  5 +----
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/selfdrive/ui/qt/offroad/wifiManager.cc b/selfdrive/ui/qt/offroad/wifiManager.cc
index ea0b549453..1ef30323d0 100644
--- a/selfdrive/ui/qt/offroad/wifiManager.cc
+++ b/selfdrive/ui/qt/offroad/wifiManager.cc
@@ -164,32 +164,20 @@ SecurityType WifiManager::getSecurityType(const QString &path) {
   }
 }
 
-void WifiManager::connect(const Network &n) {
-  return connect(n, "", "");
-}
-
-void WifiManager::connect(const Network &n, const QString &password) {
-  return connect(n, "", password);
-}
-
-void WifiManager::connect(const Network &n, const QString &username, const QString &password) {
+void WifiManager::connect(const Network &n, const QString &password, const QString &username) {
   connecting_to_network = n.ssid;
-  // disconnect();
-  forgetConnection(n.ssid); //Clear all connections that may already exist to the network we are connecting
-  connect(n.ssid, username, password, n.security_type);
-}
-
-void WifiManager::connect(const QByteArray &ssid, const QString &username, const QString &password, SecurityType security_type) {
+  seenNetworks[n.ssid].connected = ConnectedType::CONNECTING;
+  forgetConnection(n.ssid);  // Clear all connections that may already exist to the network we are connecting
   Connection connection;
   connection["connection"]["type"] = "802-11-wireless";
   connection["connection"]["uuid"] = QUuid::createUuid().toString().remove('{').remove('}');
-  connection["connection"]["id"] = "openpilot connection "+QString::fromStdString(ssid.toStdString());
+  connection["connection"]["id"] = "openpilot connection " + QString::fromStdString(n.ssid.toStdString());
   connection["connection"]["autoconnect-retries"] = 0;
 
-  connection["802-11-wireless"]["ssid"] = ssid;
+  connection["802-11-wireless"]["ssid"] = n.ssid;
   connection["802-11-wireless"]["mode"] = "infrastructure";
 
-  if (security_type == SecurityType::WPA) {
+  if (n.security_type == SecurityType::WPA) {
     connection["802-11-wireless-security"]["key-mgmt"] = "wpa-psk";
     connection["802-11-wireless-security"]["auth-alg"] = "open";
     connection["802-11-wireless-security"]["psk"] = password;
diff --git a/selfdrive/ui/qt/offroad/wifiManager.h b/selfdrive/ui/qt/offroad/wifiManager.h
index a8643fa0cf..1e880519a0 100644
--- a/selfdrive/ui/qt/offroad/wifiManager.h
+++ b/selfdrive/ui/qt/offroad/wifiManager.h
@@ -53,10 +53,7 @@ public:
   void activateModemConnection(const QDBusObjectPath &path);
   NetworkType currentNetworkType();
   void updateGsmSettings(bool roaming, QString apn);
-
-  void connect(const Network &ssid);
-  void connect(const Network &ssid, const QString &password);
-  void connect(const Network &ssid, const QString &username, const QString &password);
+  void connect(const Network &ssid, const QString &password = {}, const QString &username = {});
   void disconnect();
 
   // Tethering functions