Skip to content

Allow connman bearer backend to use UserConfig to popup a connection dialog #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lpotter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow connman bearer backend to use UserConfig to popup a connection dialog #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qtbase/src/plugins/bearer/connman/connman.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ QT = core core-private network-private dbus core-private
HEADERS += qconnmanservice_linux_p.h \
qofonoservice_linux_p.h \
qconnmanengine.h \
../qnetworksession_impl.h \
qnetworksession_impl.h \
../qbearerengine_impl.h

SOURCES += main.cpp \
qconnmanservice_linux.cpp \
qofonoservice_linux.cpp \
qconnmanengine.cpp \
../qnetworksession_impl.cpp
qnetworksession_impl.cpp

OTHER_FILES += connman.json

160 changes: 146 additions & 14 deletions qtbase/src/plugins/bearer/connman/qconnmanengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

#include "qconnmanengine.h"
#include "qconnmanservice_linux_p.h"
#include "../qnetworksession_impl.h"
#include "qnetworksession_impl.h"

#include <QtNetwork/private/qnetworkconfiguration_p.h>

Expand All @@ -67,7 +67,9 @@ QConnmanEngine::QConnmanEngine(QObject *parent)
connmanManager(new QConnmanManagerInterface(this)),
ofonoManager(new QOfonoManagerInterface(this)),
ofonoNetwork(0),
ofonoContextManager(0)
ofonoContextManager(0),
connSelectorInterface(0),
connectionDialogOpened(false)
{
qDBusRegisterMetaType<ConnmanMap>();
qDBusRegisterMetaType<ConnmanMapList>();
Expand All @@ -77,6 +79,7 @@ QConnmanEngine::QConnmanEngine(QObject *parent)
QConnmanEngine::~QConnmanEngine()
{
qt_safe_close(inotifyFileDescriptor);
delete connSelectorInterface;
}

bool QConnmanEngine::connmanAvailable() const
Expand All @@ -100,6 +103,24 @@ void QConnmanEngine::initialize()
connect(connmanManager,SIGNAL(servicesReady(QStringList)),this,SLOT(servicesReady(QStringList)));
connect(connmanManager,SIGNAL(scanFinished()),this,SLOT(finishedScan()));

/* We create a default configuration which is a pseudo config */
QNetworkConfigurationPrivate *cpPriv = new QNetworkConfigurationPrivate();
cpPriv->name = "UserChoice";
cpPriv->state = QNetworkConfiguration::Discovered;
cpPriv->isValid = true;
cpPriv->id = QStringLiteral("Any");
cpPriv->type = QNetworkConfiguration::UserChoice;
cpPriv->purpose = QNetworkConfiguration::ServiceSpecificPurpose;
cpPriv->roamingSupported = false;

QNetworkConfigurationPrivatePointer ptr(cpPriv);
userChoiceConfigurations.insert(cpPriv->id, ptr);
foundConfigurations.append(cpPriv);

locker.unlock();
Q_EMIT configurationAdded(ptr);
locker.relock();

foreach (const QString &servPath, connmanManager->getServices()) {
addServiceConfiguration(servPath);
}
Expand Down Expand Up @@ -171,13 +192,19 @@ QString QConnmanEngine::getInterfaceFromId(const QString &id)
bool QConnmanEngine::hasIdentifier(const QString &id)
{
Copy link

@amccarthy amccarthy May 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review this code makes me think that there should be a permission or access denied error. Perhaps that is something to consider when upstreaming this change.

Copy link
Author

@lpotter lpotter May 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the best fit for the time being.

QMutexLocker locker(&mutex);
return accessPointConfigurations.contains(id);
return accessPointConfigurations.contains(id) ||
userChoiceConfigurations.contains(id);
}

void QConnmanEngine::connectToId(const QString &id)
{
QMutexLocker locker(&mutex);

if (id == QStringLiteral("Any")) {
openConnectionDialog(QString());
return;
}

QConnmanServiceInterface *serv = connmanServiceInterfaces.value(id);

if (!serv->isValid()) {
Expand All @@ -190,7 +217,7 @@ void QConnmanEngine::connectToId(const QString &id)
return;
}
if (isAlwaysAskRoaming()) {
emit connectionError(id, QBearerEngineImpl::OperationNotSupported);
Q_EMIT openDialog(QStringLiteral("cellular"));
return;
}
}
Expand Down Expand Up @@ -250,6 +277,18 @@ QNetworkSession::State QConnmanEngine::sessionStateForId(const QString &id)
{
QMutexLocker locker(&mutex);

if (id == QStringLiteral("Any")) {
QNetworkConfigurationPrivatePointer userPtr = userChoiceConfigurations.value(QStringLiteral("Any"));

if ((userPtr->state & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
return QNetworkSession::Connected;
}

if ((userPtr->state & QNetworkConfiguration::Discovered) == QNetworkConfiguration::Discovered) {
return QNetworkSession::Disconnected;
}
}

QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);

if (!ptr || !ptr->isValid)
Expand Down Expand Up @@ -335,19 +374,13 @@ QNetworkConfigurationManager::Capabilities QConnmanEngine::capabilities() const

QNetworkSessionPrivate *QConnmanEngine::createSessionBackend()
{
return new QNetworkSessionPrivateImpl;
return new QNetworkSessionPrivateImpl;
}

QNetworkConfigurationPrivatePointer QConnmanEngine::defaultConfiguration()
{
const QMutexLocker locker(&mutex);
Q_FOREACH (const QString &servPath, connmanManager->getServices()) {
if (connmanServiceInterfaces.contains(servPath)) {
if (accessPointConfigurations.contains(servPath))
return accessPointConfigurations.value(servPath);
}
}
return QNetworkConfigurationPrivatePointer();
return userChoiceConfigurations.value(QStringLiteral("Any"));
Copy link

@amccarthy amccarthy May 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it is better to just return the user choice configuration unconditionally. It will already be updated to match the best configuration currently available.

Copy link
Author

@lpotter lpotter May 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are correct, as if an app first calls this when something is already active and holds on to it, when the system has no connections, it would no longer popup the dialog, because they did not have a pointer to the UserConfiguration

}

void QConnmanEngine::serviceStateChanged(const QString &state)
Expand Down Expand Up @@ -388,6 +421,47 @@ void QConnmanEngine::configurationChange(QConnmanServiceInterface *serv)

ptr->mutex.unlock();

QNetworkConfigurationPrivatePointer userPtr = userChoiceConfigurations.value(QStringLiteral("Any"));

bool userChanged = false;

userPtr->mutex.lock();

if (userPtr->name == networkName && userPtr->state != ptr->state) {
userPtr->name = "UserChoice";
userPtr->state = QNetworkConfiguration::Discovered;
userPtr->type = QNetworkConfiguration::UserChoice;
userPtr->roamingSupported = false;
userChanged = true;

} else if (userPtr->name != networkName && serv->state() == QStringLiteral("online")) {

if (!userPtr->isValid) {
userPtr->isValid = true;
}

if (userPtr->name != networkName) {
userPtr->name = networkName;
userChanged = true;
}

if (userPtr->state != curState) {
userPtr->state = curState;
userChanged = true;
}

userPtr->roamingSupported = ptr->roamingSupported;
userPtr->type = ptr->type;
}
userPtr->mutex.unlock();

if (userChanged) {
locker.unlock();
Q_EMIT configurationChanged(userPtr);
locker.relock();
}


if (changed) {
locker.unlock();
emit configurationChanged(ptr);
Expand All @@ -410,8 +484,7 @@ QNetworkConfiguration::StateFlags QConnmanEngine::getStateForService(const QStri
if (serv->type() == QLatin1String("cellular")) {

if (!serv->autoConnect()
|| (serv->roaming()
&& (isAlwaysAskRoaming() || !isRoamingAllowed(serv->path())))) {
|| (serv->roaming() && !isRoamingAllowed(serv->path()))) {
flag = (flag | QNetworkConfiguration::Defined);
} else {
flag = (flag | QNetworkConfiguration::Discovered);
Expand Down Expand Up @@ -556,6 +629,24 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath)
locker.unlock();
Q_EMIT configurationAdded(ptr);
locker.relock();

QNetworkConfigurationPrivatePointer userPtr = userChoiceConfigurations.value(QStringLiteral("Any"));
// update the user configuration if this one is online

if ((cpPriv->state & QNetworkConfiguration::Active) == QNetworkConfiguration::Active
&& (userPtr->state & QNetworkConfiguration::Active) != QNetworkConfiguration::Active) {

userPtr->mutex.lock();
userPtr->name = networkName;
Copy link

@amccarthy amccarthy May 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

userPtr->mutex.lock()

Copy link
Author

@lpotter lpotter May 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These cause asserts so am removing all use of userPtr->mutex

Copy link

@amccarthy amccarthy May 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

asserts where?

Copy link
Author

@lpotter lpotter May 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

userPtr->mutex.lock()

Copy link

@amccarthy amccarthy May 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but which line in QMutex is the assert. What condition is failing?

Copy link
Author

@lpotter lpotter May 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bah. was getting mutex.lock and mutexLocker mixed up.

userPtr->id = cpPriv->id;
userPtr->state = cpPriv->state;
userPtr->roamingSupported = cpPriv->roamingSupported;
userPtr->mutex.unlock();

Copy link

@amccarthy amccarthy May 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

userPtr->mutex.unlock()

locker.unlock();
Q_EMIT configurationChanged(userPtr);
locker.relock();
}
}
}

Expand Down Expand Up @@ -592,6 +683,47 @@ void QConnmanEngine::inotifyActivated()
}
}


void QConnmanEngine::openConnectionDialog(const QString &type)
{
if (connectionDialogOpened)
return;
// open Connection Selector
if (!connSelectorInterface) {
connSelectorInterface = new QDBusInterface(QStringLiteral("com.jolla.lipstick.ConnectionSelector"),
QStringLiteral("/"),
QStringLiteral("com.jolla.lipstick.ConnectionSelectorIf"),
QDBusConnection::sessionBus(),
0);
}
connSelectorInterface->connection().connect(QStringLiteral("com.jolla.lipstick.ConnectionSelector"),
QStringLiteral("/"),
QStringLiteral("com.jolla.lipstick.ConnectionSelectorIf"),
QStringLiteral("connectionSelectorClosed"),
this,
SLOT(connectionDialogClosed(bool)));
QList<QVariant> args;
args.append(type);
connSelectorInterface->callWithArgumentList(QDBus::NoBlock,
QStringLiteral("openConnection"), args);
connectionDialogOpened = true;
}

void QConnmanEngine::connectionDialogClosed(bool b)
{
connSelectorInterface->connection().disconnect(QStringLiteral("com.jolla.lipstick.ConnectionSelector"),
QStringLiteral("/"),
QStringLiteral("com.jolla.lipstick.ConnectionSelectorIf"),
QStringLiteral("connectionSelectorClosed"),
this,
SLOT(connectionDialogClosed(bool)));

if (!b && connectionDialogOpened) {
Q_EMIT dialogClosed(b);
}
connectionDialogOpened = false;
}

QT_END_NAMESPACE

#endif // QT_NO_DBUS
Expand Down
12 changes: 12 additions & 0 deletions qtbase/src/plugins/bearer/connman/qconnmanengine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ class QConnmanEngine : public QBearerEngineImpl

QList<QNetworkConfigurationPrivate *> getConfigurations();

void openConnectionDialog(const QString &type);

Q_SIGNALS:
void openDialog(const QString &type);
void dialogClosed(bool);

private Q_SLOTS:

void doRequestUpdate();
Expand All @@ -109,6 +115,9 @@ private Q_SLOTS:
void configurationChange(QConnmanServiceInterface * service);
void reEvaluateCellular();
void inotifyActivated();

void connectionDialogClosed(bool b);

private:
QConnmanManagerInterface *connmanManager;

Expand Down Expand Up @@ -139,9 +148,12 @@ private Q_SLOTS:

int inotifyWatcher;
int inotifyFileDescriptor;
QDBusInterface *connSelectorInterface;
bool connectionDialogOpened;

protected:
bool requiresPolling() const;

};


Expand Down
Loading