Castopod
/
kasts
mirror of https://github.com/KDE/kasts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove network connectivity check 

Apparently in some cases the network manager is incorrectly signaling
that the system is offline while it's actually online. The current
implementation does not have a way to circumvent that incorrect
reporting. Also the error reporting made it seem that the actual
problem is a metered connection. Ripping out the connectivity check
solves these issues at the expense of connections timing out rather than
the connection not being set up in the first place when the system is
offline.

CCBUG: 475400
This commit is contained in:
Bart De Vries 2023-10-17 09:36:13 +02:00
parent 4abfa7a5d1
commit ea5d01043d
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/networkconnectionmanager.cpp
View File

@ -62,12 +62,10 @@ bool NetworkConnectionManager::feedUpdatesAllowed() const
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool allowed = true;
if (m_backendAvailable) {
allowed = (QNetworkInformation::instance()->reachability() != QNetworkInformation::Reachability::Disconnected
&& (!QNetworkInformation::instance()->isMetered() || SettingsManager::self()->allowMeteredFeedUpdates()));
allowed = (!QNetworkInformation::instance()->isMetered() || SettingsManager::self()->allowMeteredFeedUpdates());
}
#else
bool allowed = (m_networkStatus.connectivity() != SolidExtras::NetworkStatus::No
&& (m_networkStatus.metered() != SolidExtras::NetworkStatus::Yes || SettingsManager::self()->allowMeteredFeedUpdates()));
bool allowed = (m_networkStatus.metered() != SolidExtras::NetworkStatus::Yes || SettingsManager::self()->allowMeteredFeedUpdates());
#endif
qCDebug(kastsNetworkConnectionManager) << "FeedUpdatesAllowed()" << allowed;
@ -80,12 +78,10 @@ bool NetworkConnectionManager::episodeDownloadsAllowed() const
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool allowed = true;
if (m_backendAvailable) {
allowed = (QNetworkInformation::instance()->reachability() != QNetworkInformation::Reachability::Disconnected
&& (!QNetworkInformation::instance()->isMetered() || SettingsManager::self()->allowMeteredEpisodeDownloads()));
allowed = (!QNetworkInformation::instance()->isMetered() || SettingsManager::self()->allowMeteredEpisodeDownloads());
}
#else
bool allowed = (m_networkStatus.connectivity() != SolidExtras::NetworkStatus::No
&& (m_networkStatus.metered() != SolidExtras::NetworkStatus::Yes || SettingsManager::self()->allowMeteredEpisodeDownloads()));
bool allowed = (m_networkStatus.metered() != SolidExtras::NetworkStatus::Yes || SettingsManager::self()->allowMeteredEpisodeDownloads());
#endif
qCDebug(kastsNetworkConnectionManager) << "EpisodeDownloadsAllowed()" << allowed;
@ -98,12 +94,10 @@ bool NetworkConnectionManager::imageDownloadsAllowed() const
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool allowed = true;
if (m_backendAvailable) {
allowed = (QNetworkInformation::instance()->reachability() != QNetworkInformation::Reachability::Disconnected
&& (!QNetworkInformation::instance()->isMetered() || SettingsManager::self()->allowMeteredImageDownloads()));
allowed = (!QNetworkInformation::instance()->isMetered() || SettingsManager::self()->allowMeteredImageDownloads());
}
#else
bool allowed = (m_networkStatus.connectivity() != SolidExtras::NetworkStatus::No
&& (m_networkStatus.metered() != SolidExtras::NetworkStatus::Yes || SettingsManager::self()->allowMeteredImageDownloads()));
bool allowed = (m_networkStatus.metered() != SolidExtras::NetworkStatus::Yes || SettingsManager::self()->allowMeteredImageDownloads());
#endif
qCDebug(kastsNetworkConnectionManager) << "ImageDownloadsAllowed()" << allowed;
@ -116,12 +110,10 @@ bool NetworkConnectionManager::streamingAllowed() const
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool allowed = true;
if (m_backendAvailable) {
allowed = (QNetworkInformation::instance()->reachability() != QNetworkInformation::Reachability::Disconnected
&& (!QNetworkInformation::instance()->isMetered() || SettingsManager::self()->allowMeteredStreaming()));
allowed = (!QNetworkInformation::instance()->isMetered() || SettingsManager::self()->allowMeteredStreaming());
}
#else
bool allowed = (m_networkStatus.connectivity() != SolidExtras::NetworkStatus::No
&& (m_networkStatus.metered() != SolidExtras::NetworkStatus::Yes || SettingsManager::self()->allowMeteredStreaming()));
bool allowed = (m_networkStatus.metered() != SolidExtras::NetworkStatus::Yes || SettingsManager::self()->allowMeteredStreaming());
#endif
qCDebug(kastsNetworkConnectionManager) << "StreamingAllowed()" << allowed;