fix: Clear wifi networks in initial setup (#516)

This closes #511

Author: zehnm

setup/SetupStep3.qml

@@ -28,11 +28,15 @@ import WifiControl 1.0
 
 import "qrc:/basic_ui" as BasicUI
 
+// TODO(marton) back swipe or button to choose language / country setting again
 Item {
     id: container
     width: 480; height: 800
 
     Component.onCompleted: {
+        // TODO(marton) check if Wifi connection is already established and ask user to use it, or to set it up again.
+        //              This state can happen through a reboot during a previous setup process.
+        // Connection check: wifi.wifiStatus.connected
         networkScanTimer.start();
     }
 

setup/SetupStep4.qml

@@ -46,6 +46,7 @@ Rectangle {
         swipeViewObj.parent.parent.wifiPassword = passwordField.text;
         swipeViewObj.parent.parent.wifiSsid = name;
 
+        wifi.clearConfiguredNetworks();
         wifi.join(name, passwordField.text, security);
         inputPanel.active = false;
         container.state = "closed";

setup/SetupStep4Other.qml

@@ -53,6 +53,7 @@ Rectangle {
             security = WifiSecurity.DEFAULT;
         }
 
+        wifi.clearConfiguredNetworks();
         wifi.join(name, passwordField.text, security);
         inputPanel.active = false;
         container.state = "closed";

sources/hardware/linux/wifi_wpasupplicant.cpp

@@ -158,19 +158,18 @@ bool WifiWpaSupplicant::clearConfiguredNetworks() {
 
     setConnected(false);
 
-    if (!controlRequest("REMOVE_NETWORK all")) {
-        return false;
-    }
+    bool ret = false;
+    if (controlRequest("REMOVE_NETWORK all") && saveConfiguration()) {
+        stopScanTimer();
 
-    if (!saveConfiguration()) {
-        return false;
+        qCInfo(lcWifiWpaCtrl) << "Disconnected, all networks removed and cleared configuration";
+        ret = true;
     }
 
-    stopScanTimer();
-
-    qCInfo(lcWifiWpaCtrl) << "All networks removed and disconnected";
-
-    return true;
+    // avoid deadlock.
+    // DISCONNECT doc states: "Disconnect and wait for REASSOCIATE or RECONNECT command before connecting."
+    controlRequest("RECONNECT");
+    return ret;
 }
 
 bool WifiWpaSupplicant::join(const QString& ssid, const QString& password, WifiSecurity::Enum security) {

translations/en_US.ts

@@ -856,36 +856,36 @@ Navigate your internet browser to: http://</source>
 <context>
     <name>SetupStep3</name>
     <message>
-        <location filename="../setup/SetupStep3.qml" line="63"/>
+        <location filename="../setup/SetupStep3.qml" line="67"/>
         <source>Wi-Fi setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setup/SetupStep3.qml" line="74"/>
+        <location filename="../setup/SetupStep3.qml" line="78"/>
         <source>Select a Wi-Fi network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setup/SetupStep3.qml" line="166"/>
+        <location filename="../setup/SetupStep3.qml" line="170"/>
         <source>Join other</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetupStep4</name>
     <message>
-        <location filename="../setup/SetupStep4.qml" line="97"/>
+        <location filename="../setup/SetupStep4.qml" line="98"/>
         <source>Enter password for
 &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setup/SetupStep4.qml" line="115"/>
+        <location filename="../setup/SetupStep4.qml" line="116"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../setup/SetupStep4.qml" line="174"/>
+        <location filename="../setup/SetupStep4.qml" line="175"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>