openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'y2209bug' into 'dbus-interface' 

Fixbug 122742 路由器设置WiFi从不加密到加密后 点击连接没有弹出密码框 一直转圈

See merge request kylin-desktop/kylin-nm!696
This commit is contained in:
赵世旭 2022-08-22 06:42:22 +00:00
parent bed4d3e420 6c2f2113ae
commit e66855301a
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/frontend/list-items/wlanlistitem.cpp
View File

@ -448,13 +448,34 @@ void WlanListItem::onNetButtonClicked()
return;
}
//获取有配置网络的安全类型
KyKeyMgmt type = m_wirelessConnectOperation->getConnectKeyMgmt(m_wirelessNetItem.m_connectUuid);
KySecuType kySecuType = NONE;
if (type == WpaNone || type == Unknown) {
kySecuType = NONE;
} else if (type == WpaPsk) {
kySecuType = WPA_AND_WPA2_PERSONAL;
} else if (type == SAE) {
kySecuType = WPA3_PERSONAL;
} else if (type == WpaEap) {
kySecuType = WPA_AND_WPA2_ENTERPRISE;
} else {
qDebug() << "KeyMgmt not support now " << type;
}
//有配置或者无密码的wifi直接连接
if (m_wirelessNetItem.m_isConfigured) {
m_wirelessConnectOperation->activeWirelessConnect(m_wlanDevice, m_wirelessNetItem.m_connectUuid);
qDebug()<<"[WlanListItem] Has configuration, will be activated. ssid = "
<< m_wirelessNetItem.m_NetSsid << Q_FUNC_INFO << __LINE__;
m_netButton->startLoading();
return;
if (m_wirelessNetItem.m_kySecuType == kySecuType) {
//安全类型不变直接连接
m_wirelessConnectOperation->activeWirelessConnect(m_wlanDevice, m_wirelessNetItem.m_connectUuid);
qDebug()<<"[WlanListItem] Has configuration, will be activated. ssid = "
<< m_wirelessNetItem.m_NetSsid << Q_FUNC_INFO << __LINE__;
m_netButton->startLoading();
return;
} else {
//安全类型改变则删除连接
m_wirelessConnectOperation->deleteWirelessConnect(m_wirelessNetItem.m_connectUuid);
}
}
if (!this->m_connectButton->isVisible() && m_wirelessNetItem.m_secuType != "") {