From 81fe8b148834d236c78404e2e91539be4d689a70 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 1 Aug 2021 22:37:13 +0200
Subject: [PATCH] [libcalamares] Expand API for setting URLs to check

---
 src/libcalamares/network/Manager.cpp | 19 +++++++++++++++----
 src/libcalamares/network/Manager.h   |  7 +++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp
index e5277d74e..62ab60e60 100644
--- a/src/libcalamares/network/Manager.cpp
+++ b/src/libcalamares/network/Manager.cpp
@@ -203,10 +203,21 @@ Manager::checkHasInternet()
 void
 Manager::setCheckHasInternetUrl( const QUrl& url )
 {
-    if ( d->m_hasInternetUrls.empty() )
-    {
-        d->m_lastCheckedUrlIndex = -1;
-    }
+    d->m_lastCheckedUrlIndex = -1;
+    d->m_hasInternetUrls.clear();
+    d->m_hasInternetUrls.append( url );
+}
+
+void
+Manager::setCheckHasInternetUrl( const QVector< QUrl >& urls )
+{
+    d->m_lastCheckedUrlIndex = -1;
+    d->m_hasInternetUrls = urls;
+}
+
+void
+Manager::addCheckHasInternetUrl( const QUrl& url )
+{
     d->m_hasInternetUrls.append( url );
 }
 
diff --git a/src/libcalamares/network/Manager.h b/src/libcalamares/network/Manager.h
index a038dceae..8bc3dded7 100644
--- a/src/libcalamares/network/Manager.h
+++ b/src/libcalamares/network/Manager.h
@@ -16,6 +16,7 @@
 #include <QDebug>
 #include <QObject>
 #include <QUrl>
+#include <QVector>
 
 #include <chrono>
 #include <memory>
@@ -122,6 +123,12 @@ public:
     /// @brief Set the URL which is used for the general "is there internet" check.
     void setCheckHasInternetUrl( const QUrl& url );
 
+    /// @brief Adds an (extra) URL to check
+    void addCheckHasInternetUrl( const QUrl& url );
+
+    /// @brief Set a collection of URLs used for the general "is there internet" check.
+    void setCheckHasInternetUrl( const QVector< QUrl >& urls );
+
     /** @brief Do a network request asynchronously.
      *
      * Returns a pointer to the reply-from-the-request.