ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #213: Only include active bearers

Browse Source
This commit is contained in:
Jenkins 2019-06-21 00:38:55 +02:00
commit 7de5c052a7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libnymea-app-core/connection/nymeaconnection.cpp
View File

@ -387,10 +387,10 @@ void NymeaConnection::onDisconnected()
void NymeaConnection::updateActiveBearers() void NymeaConnection::updateActiveBearers()
{ {
NymeaConnection::BearerTypes availableBearerTypes; NymeaConnection::BearerTypes availableBearerTypes;
QList<QNetworkConfiguration> configs = m_networkConfigManager->allConfigurations(); QList<QNetworkConfiguration> configs = m_networkConfigManager->allConfigurations(QNetworkConfiguration::Active);
qDebug() << "Network configuations:" << configs.count(); qDebug() << "Network configuations:" << configs.count();
foreach (const QNetworkConfiguration &config, configs) { foreach (const QNetworkConfiguration &config, configs) {
qDebug() << "Candidate network config:" << config.name() << config.bearerTypeFamily() << config.bearerTypeName(); qDebug() << "Active network config:" << config.name() << config.bearerTypeFamily() << config.bearerTypeName();
// NOTE: iOS doesn't correctly report bearer types. It'll be Unknown all the time. Let's hardcode it to WiFi for that... // NOTE: iOS doesn't correctly report bearer types. It'll be Unknown all the time. Let's hardcode it to WiFi for that...
#if defined(Q_OS_IOS) #if defined(Q_OS_IOS)
@ -399,6 +399,15 @@ void NymeaConnection::updateActiveBearers()
availableBearerTypes.setFlag(qBearerTypeToNymeaBearerType(config.bearerType())); availableBearerTypes.setFlag(qBearerTypeToNymeaBearerType(config.bearerType()));
#endif #endif
} }
if (availableBearerTypes == NymeaConnection::BearerTypeNone) {
// This is just debug info... On some platform bearer management seems a bit broken, so let's get some infos right away...
qDebug() << "No active bearer available. Inactive bearers are:";
QList<QNetworkConfiguration> configs = m_networkConfigManager->allConfigurations();
foreach (const QNetworkConfiguration &config, configs) {
qDebug() << "Inactive network config:" << config.name() << config.bearerTypeFamily() << config.bearerTypeName();
}
}
if (m_availableBearerTypes != availableBearerTypes) { if (m_availableBearerTypes != availableBearerTypes) {
qDebug() << "Available Bearer Types changed:" << availableBearerTypes; qDebug() << "Available Bearer Types changed:" << availableBearerTypes;
m_availableBearerTypes = availableBearerTypes; m_availableBearerTypes = availableBearerTypes;