summaryrefslogtreecommitdiff
path: root/modules/controlcenter/network/NetworkingPane.qml
diff options
context:
space:
mode:
Diffstat (limited to 'modules/controlcenter/network/NetworkingPane.qml')
-rw-r--r--modules/controlcenter/network/NetworkingPane.qml43
1 files changed, 1 insertions, 42 deletions
diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml
index 9a7a4e1..d76e8f5 100644
--- a/modules/controlcenter/network/NetworkingPane.qml
+++ b/modules/controlcenter/network/NetworkingPane.qml
@@ -415,7 +415,7 @@ Item {
if (modelData && modelData.active) {
Nmcli.disconnectFromNetwork();
} else if (modelData) {
- handleWirelessConnect(modelData);
+ NetworkConnection.handleConnect(modelData, root.session, null);
}
}
}
@@ -586,46 +586,5 @@ Item {
Nmcli.loadSavedConnections(() => {});
}
}
-
- function handleWirelessConnect(network): void {
- if (Nmcli.active && Nmcli.active.ssid !== network.ssid) {
- Nmcli.disconnectFromNetwork();
- Qt.callLater(() => {
- connectToWirelessNetwork(network);
- });
- } else {
- connectToWirelessNetwork(network);
- }
- }
-
- function connectToWirelessNetwork(network): void {
- if (network.isSecure) {
- const hasSavedProfile = Nmcli.hasSavedProfile(network.ssid);
-
- if (hasSavedProfile) {
- Nmcli.connectToNetwork(network.ssid, "", network.bssid, null);
- } else {
- Nmcli.connectToNetworkWithPasswordCheck(
- network.ssid,
- network.isSecure,
- (result) => {
- if (result.needsPassword) {
- if (Nmcli.pendingConnection) {
- Nmcli.connectionCheckTimer.stop();
- Nmcli.immediateCheckTimer.stop();
- Nmcli.immediateCheckTimer.checkCount = 0;
- Nmcli.pendingConnection = null;
- }
- root.session.network.showPasswordDialog = true;
- root.session.network.pendingNetwork = network;
- }
- },
- network.bssid
- );
- }
- } else {
- Nmcli.connectToNetwork(network.ssid, "", network.bssid, null);
- }
- }
}