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 #include #include +#include #include #include @@ -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.