Skip to content

fix: move connection selection before network enable #472

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
caixr23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: move connection selection before network enable #472

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
30 changes: 16 additions & 14 deletions network-service-plugin/src/system/networkthread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,22 @@ QString NetworkThread::setPropVpnEnabled(bool enabled)

QString NetworkThread::enableDevice(NetworkManager::Device::Ptr device)
{
auto connPaths = device->availableConnections();
qCDebug(DSM()) << "available connections:" << connPaths;
QString connPath0;
QDateTime maxTs;
for (auto &&connPath : connPaths) {
auto settings = connPath->settings();
if (!settings->autoconnect()) {
continue;
}
QDateTime ts = settings->timestamp();
if (maxTs < ts || connPath0.isEmpty()) {
maxTs = ts;
connPath0 = connPath->path();
}
}

bool enabled = NetworkManager::isNetworkingEnabled();
if (!enabled) {
NetworkManager::setNetworkingEnabled(true);
Expand All @@ -295,20 +311,6 @@ QString NetworkThread::enableDevice(NetworkManager::Device::Ptr device)
}

// device->setManaged(true); // TODO: 应该不需要
auto connPaths = device->availableConnections();
qCDebug(DSM()) << "available connections:" << connPaths;
QString connPath0;
QDateTime maxTs;
for (auto &&connPath : connPaths) {
auto settings = connPath->settings();
if (!settings->autoconnect()) {
continue;
}
QDateTime ts = settings->timestamp();
if (maxTs < ts || connPath0.isEmpty()) {
connPath0 = connPath->path();
}
}
return connPath0.isEmpty() ? "/" : connPath0;
}

Expand Down