Use existing pingCheckProcess while in full & limited states.

Modules/Panels/WiFi/WiFiNetworksList.qml

@@ -159,19 +159,10 @@ NBox {
                     id: connectedText
                     anchors.centerIn: parent
                     text: {
-                      switch (NetworkService.networkConnectivity) {
-                      case "full":
-                        return I18n.tr("wifi.panel.connected");
-                      case "limited":
-                        return I18n.tr("wifi.panel.internet-limited");
-                      case "portal":  // Where Captive Portal is detected (User intervention needed)
-                        return I18n.tr("wifi.panel.action-required");
-                        // I assume unknown is for connecting/disconnecting state where connectivity hasn't been determined yet (Shouldn't be visible for long enough to matter)
-                        // and none is for no connectivity at all.
-                        // None and Unknown will return direct output of NetworkService.networkConnectivity
-                      default:
-                        return NetworkService.networkConnectivity;
+                      if (NetworkService.networkConnectivity === "portal") {
+                        return I18n.tr("wifi.panel.action-required"); // Where Captive Portal is detected (User intervention needed)
                       }
+                      return NetworkService.internetConnectivity ? I18n.tr("wifi.panel.connected") : I18n.tr("wifi.panel.internet-limited");
                     }
                     pointSize: Style.fontSizeXXS
                     color: Color.mOnPrimary

Services/Networking/NetworkService.qml

@@ -585,8 +585,6 @@ Singleton {
     running: false
     command: ["nmcli", "networking", "connectivity", "check"]
 
-    property int failedChecks: 0
-
     stdout: StdioCollector {
       onStreamFinished: {
         const result = text.trim();
@@ -596,28 +594,25 @@ Singleton {
 
         if (result === "none" && root.networkConnectivity !== result) {
           root.networkConnectivity = result;
-          connectivityCheckProcess.failedChecks = 0;
           root.scan();
         }
 
-        if (result === "full" && root.networkConnectivity !== result) {
-          root.networkConnectivity = result;
-          root.internetConnectivity = true;
-          connectivityCheckProcess.failedChecks = 0;
-          root.scan();
+        if (result === "full") {
+          if (root.networkConnectivity !== result) {
+            root.networkConnectivity = result;
+          }
+          pingCheckProcess.running = true;
         }
 
-        if ((result === "limited" || result === "portal") && root.networkConnectivity !== result) {
-          connectivityCheckProcess.failedChecks++;
-          if (connectivityCheckProcess.failedChecks === 3) {
+        if (result === "limited" || result === "portal") {
+          if (root.networkConnectivity !== result) {
             root.networkConnectivity = result;
-            pingCheckProcess.running = true;
           }
+          pingCheckProcess.running = true;
         }
 
         if (result === "unknown" && root.networkConnectivity !== result) {
           root.networkConnectivity = result;
-          connectivityCheckProcess.failedChecks = 0;
         }
       }
     }
@@ -633,16 +628,14 @@ Singleton {
 
   Process {
     id: pingCheckProcess
-    command: ["sh", "-c", "ping -c1 -W2 ping.archlinux.org >/dev/null 2>&1 || " + "ping -c1 -W2 1.1.1.1 >/dev/null 2>&1 || " + "curl -fsI --max-time 5 https://cloudflare.com/cdn-cgi/trace >/dev/null 2>&1"]
+    command: ["sh", "-c", "ping -c1 -W2 ping.archlinux.org >/dev/null 2>&1 || ping -c1 -W2 1.1.1.1 >/dev/null 2>&1 || curl -fsI --max-time 5 https://cloudflare.com/cdn-cgi/trace >/dev/null 2>&1"]
 
     onExited: function (exitCode, exitStatus) {
       if (exitCode === 0) {
-        connectivityCheckProcess.failedChecks = 0;
+        root.internetConnectivity = true;
       } else {
         root.internetConnectivity = false;
         Logger.i("Network", "No internet connectivity");
-        ToastService.showWarning(root.cachedLastConnected, I18n.tr("toast.internet.limited"));
-        connectivityCheckProcess.failedChecks = 0;
       }
       root.scan();
     }