From d8de7c7e4b1b57470297dc238b210670f87c23ba Mon Sep 17 00:00:00 2001
From: ATMDA <atdma2600@gmail.com>
Date: Sun, 9 Nov 2025 21:43:51 -0500
Subject: controlcenter: wifi passphrase input fix: dependability issues with
 nmcli

---
 modules/controlcenter/network/NetworkList.qml | 29 +++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'modules/controlcenter/network/NetworkList.qml')

diff --git a/modules/controlcenter/network/NetworkList.qml b/modules/controlcenter/network/NetworkList.qml
index 8dfebc7..df05de7 100644
--- a/modules/controlcenter/network/NetworkList.qml
+++ b/modules/controlcenter/network/NetworkList.qml
@@ -214,14 +214,35 @@ ColumnLayout {
                             if (modelData.active) {
                                 Network.disconnectFromNetwork();
                             } else {
-                                if (modelData.isSecure) {
-                                    root.session.network.showPasswordDialog = true;
-                                    root.session.network.pendingNetwork = modelData;
+                                // If already connected to a different network, disconnect first
+                                if (Network.active && Network.active.ssid !== modelData.ssid) {
+                                    Network.disconnectFromNetwork();
+                                    // Wait a moment before connecting to new network
+                                    Qt.callLater(() => {
+                                        connectToNetwork();
+                                    });
                                 } else {
-                                    Network.connectToNetwork(modelData.ssid, "");
+                                    connectToNetwork();
                                 }
                             }
                         }
+
+                        function connectToNetwork(): void {
+                            if (modelData.isSecure) {
+                                // Try connecting without password first (in case it's saved)
+                                Network.connectToNetworkWithPasswordCheck(
+                                    modelData.ssid,
+                                    modelData.isSecure,
+                                    () => {
+                                        // Callback: connection failed, show password dialog
+                                        root.session.network.showPasswordDialog = true;
+                                        root.session.network.pendingNetwork = modelData;
+                                    }
+                                );
+                            } else {
+                                Network.connectToNetwork(modelData.ssid, "");
+                            }
+                        }
                     }
 
                     MaterialIcon {
-- 
cgit v1.2.3-freya