Skip to content

refactor: extract access point lookup and state handler #626

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

Merged
wjyrich merged 1 commit into from
Sep 20, 2026
Merged

refactor: extract access point lookup and state handler #626

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
107 changes: 59 additions & 48 deletions src/impl/networkmanager/devicemanagerrealize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,55 +986,10 @@ void WirelessDeviceManagerRealize::onActiveConnectionChanged()
{
NetworkManager::ActiveConnection::Ptr activeConnection = m_device->activeConnection();

auto findAccessPoints = [this](const NetworkManager::ActiveConnection::Ptr &activeConnection)->AccessPointProxyNM *{
if (activeConnection.isNull())
return nullptr;

QList<AccessPointInfo *>::iterator itAccessPoint = std::find_if(m_accessPointInfos.begin(), m_accessPointInfos.end(), [ activeConnection ](AccessPointInfo *accessPoint) {
NetworkManager::WirelessSetting::Ptr wirelessSetting = activeConnection->connection()->settings()->setting(NetworkManager::Setting::SettingType::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
if (!wirelessSetting.isNull())
return accessPoint->accessPoint()->ssid() == wirelessSetting->ssid();

return false;
});

if (itAccessPoint == m_accessPointInfos.end())
return nullptr;

return (*itAccessPoint)->proxy();
};

AccessPointProxyNM *activeAccessPoint = findAccessPoints(activeConnection);
AccessPointProxyNM *activeAccessPoint = findAccessPoints(activeConnection.data());
if (activeAccessPoint) {
connect(activeConnection.data(), &NetworkManager::ActiveConnection::stateChanged, this, [ this, activeConnection, findAccessPoints ](NetworkManager::ActiveConnection::State state) {
AccessPointProxyNM *activeAp = findAccessPoints(activeConnection);
NetworkManager::Connection::Ptr conn = activeConnection->connection();
if (activeAp && conn) {
conn->settings()->setTimestamp(QDateTime::currentDateTime());
if (state == NetworkManager::ActiveConnection::Activated && conn->isUnsaved()) {
if (SessionStateTracker::instance()->isSessionActive()) {
const NetworkManager::Setting::SettingType settingType[] = { NetworkManager::Setting::Security8021x, NetworkManager::Setting::WirelessSecurity };
for (auto type : settingType) {
NetworkManager::Setting::Ptr setting = conn->settings()->setting(type);
if (setting) {
conn->secrets(setting->name());
}
}
conn->save();
}
connect(conn.data(), &NetworkManager::Connection::unsavedChanged, this, [this] {
Q_EMIT activeConnectionChanged();
});
}
activeAp->updateStatus(convertStateFromNetworkManager(state));
WirelessConnection *connection = findConnection(conn->path());
if (connection)
connection->updateTimeStamp(conn->settings()->timestamp());

qCDebug(DNC) << "active connection changed:" << activeAp->ssid() << "device:" << m_device->interfaceName() << "status:" << activeAp->status();
Q_EMIT activeConnectionChanged();
}
});
connect(activeConnection.data(), &NetworkManager::ActiveConnection::stateChanged,
this, &WirelessDeviceManagerRealize::onStateChanged, Qt::UniqueConnection);

activeAccessPoint->updateStatus(convertStateFromNetworkManager(activeConnection->state()));
WirelessConnection *connection = findConnection(activeConnection->connection()->path());
Expand All @@ -1050,6 +1005,62 @@ void WirelessDeviceManagerRealize::onActiveConnectionChanged()
Q_EMIT activeConnectionChanged();
}

AccessPointProxyNM *WirelessDeviceManagerRealize::findAccessPoints(NetworkManager::ActiveConnection *activeConnection) const
{
if (!activeConnection)
return nullptr;

const NetworkManager::Connection::Ptr connection = activeConnection->connection();
if (connection.isNull())
return nullptr;

const NetworkManager::WirelessSetting::Ptr wirelessSetting = connection->settings()->setting(NetworkManager::Setting::SettingType::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
if (wirelessSetting.isNull())
return nullptr;

const auto itAccessPoint = std::find_if(m_accessPointInfos.cbegin(), m_accessPointInfos.cend(), [wirelessSetting](AccessPointInfo *accessPoint) {
return accessPoint->accessPoint()->ssid() == wirelessSetting->ssid();
});

return itAccessPoint == m_accessPointInfos.cend() ? nullptr : (*itAccessPoint)->proxy();
}

void WirelessDeviceManagerRealize::onStateChanged(NetworkManager::ActiveConnection::State state)
{
NetworkManager::ActiveConnection *activeConnection = qobject_cast<NetworkManager::ActiveConnection *>(sender());
AccessPointProxyNM *activeAp = findAccessPoints(activeConnection);
if (!activeAp)
return;

NetworkManager::Connection::Ptr conn = activeConnection->connection();
if (conn.isNull())
return;

conn->settings()->setTimestamp(QDateTime::currentDateTime());
if (state == NetworkManager::ActiveConnection::Activated && conn->isUnsaved()) {
if (SessionStateTracker::instance()->isSessionActive()) {
const NetworkManager::Setting::SettingType settingTypes[] = { NetworkManager::Setting::Security8021x, NetworkManager::Setting::WirelessSecurity };
for (auto type : settingTypes) {
NetworkManager::Setting::Ptr setting = conn->settings()->setting(type);
if (setting)
conn->secrets(setting->name());
}
conn->save();
}
connect(conn.data(), &NetworkManager::Connection::unsavedChanged, this, [this] {
Q_EMIT activeConnectionChanged();
}, Qt::UniqueConnection);
Comment on lines +1050 to +1052

@sourcery-ai sourcery-ai Bot Sep 11, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

issue (bug_risk): Qt::UniqueConnection does not deduplicate connections whose receiver is a lambda/functor, so each activation that reaches this block creates another unsavedChanged subscription. When the connection remains unsaved and emits unsavedChanged, the lambda emits activeConnectionChanged() once per accumulated subscription.

Triggers: When the same unsaved connection reaches the Activated state more than once, or when saving fails and the connection remains unsaved.

Suggested fix: Replace the lambda with a dedicated slot or explicitly store and disconnect the QMetaObject::Connection before reconnecting.

}

activeAp->updateStatus(convertStateFromNetworkManager(state));
WirelessConnection *connection = findConnection(conn->path());
if (connection)
connection->updateTimeStamp(conn->settings()->timestamp());

qCDebug(DNC) << "active connection changed:" << activeAp->ssid() << "device:" << m_device->interfaceName() << "status:" << activeAp->status();
Q_EMIT activeConnectionChanged();
}

DeviceStatus WirelessDeviceManagerRealize::deviceStatus() const
{
// 如果当前设备开了热点，则认为它为断开状态
Expand Down
3 changes: 3 additions & 0 deletions src/impl/networkmanager/devicemanagerrealize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ namespace network {

class ProcesserInterface;
class IpManager;
class AccessPointProxyNM;

class DeviceManagerRealize : public NetworkDeviceRealize
{
Expand Down Expand Up @@ -143,8 +144,10 @@ private Q_SLOTS:
void onNetworkAppeared(const QString &ssid);
void onNetworkDisappeared(const QString &ssid);
void onInterfaceFlagsChanged();
void onStateChanged(NetworkManager::ActiveConnection::State state);

private:
AccessPointProxyNM *findAccessPoints(NetworkManager::ActiveConnection *activeConnection) const;
NetworkManager::WirelessDevice::Ptr m_device;
QList<WirelessConnection *> m_wirelessConnections;
QList<AccessPointInfo *> m_accessPointInfos;
Expand Down
Loading