From 56b21bbb2088718774247853f6e6646449cdf8d8 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sat, 28 Jan 2017 10:31:09 +0100
Subject: [PATCH] [welcome] refactoring of the checkHasInternet() function.

---
 .../welcome/checker/RequirementsChecker.cpp   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/modules/welcome/checker/RequirementsChecker.cpp b/src/modules/welcome/checker/RequirementsChecker.cpp
index 3d7eb7da7..6bfc31ab7 100644
--- a/src/modules/welcome/checker/RequirementsChecker.cpp
+++ b/src/modules/welcome/checker/RequirementsChecker.cpp
@@ -36,7 +36,9 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QLabel>
-#include <QNetworkAccessManager>
+#include <QNetworkConfigurationManager>
+#include <QNetworkConfiguration>
+
 #include <QProcess>
 #include <QTimer>
 
@@ -337,8 +339,20 @@ RequirementsChecker::checkHasPower()
 bool
 RequirementsChecker::checkHasInternet()
 {
-    // default to true in the QNetworkAccessManager::UnknownAccessibility case
-    bool hasInternet = QNetworkAccessManager(this).networkAccessible() != QNetworkAccessManager::NotAccessible;
+    // doc from: https://doc.qt.io/qt-5/qnetworkconfigurationmanager.html#isOnline
+    bool hasInternet = false;
+
+    QNetworkConfigurationManager mgr;
+    QList<QNetworkConfiguration> activeConfigs = mgr.allConfigurations(QNetworkConfiguration::Active);
+
+    if (activeConfigs.count() > 0) {
+        Q_ASSERT(mgr.isOnline());
+        hasInternet = mgr.isOnline();
+    }
+    else {
+        Q_ASSERT(!mgr.isOnline());
+    }
+
     Calamares::JobQueue::instance()->globalStorage()->insert( "hasInternet", hasInternet );
     return hasInternet;
 }