diff --git a/src/backend/dbus-interface/kywirelessnetresource.cpp b/src/backend/dbus-interface/kywirelessnetresource.cpp index bee368d8..0ecb6531 100644 --- a/src/backend/dbus-interface/kywirelessnetresource.cpp +++ b/src/backend/dbus-interface/kywirelessnetresource.cpp @@ -724,7 +724,7 @@ bool KyWirelessNetResource::getEnterPriseInfoFast(QString &uuid, KyEapMethodFast info.m_anonIdentity = setting->anonymousIdentity(); info.m_pacProvisioning = (KyFastProvisioning)setting->phase1FastProvisioning(); - info.m_pacFilePath = setting->caPath(); + info.m_pacFilePath = setting->pacFile(); if (info.m_pacFilePath.left(7) == "file://") { info.m_pacFilePath = info.m_pacFilePath.mid(7); } diff --git a/src/frontend/netdetails/joinhiddenwifipage.cpp b/src/frontend/netdetails/joinhiddenwifipage.cpp index 313be9eb..f250feca 100644 --- a/src/frontend/netdetails/joinhiddenwifipage.cpp +++ b/src/frontend/netdetails/joinhiddenwifipage.cpp @@ -216,9 +216,18 @@ void JoinHiddenWiFiPage::onBtnJoinClicked() } else if (eapType == PEAP) { m_secuWidget->updatePeapChange(m_info.peapInfo); m_wirelessConnOpration->addAndActiveWirelessEnterPrisePeapConnect(m_info.peapInfo, connSettingInfo, m_devName, true); - } else if (eapType = TTLS) { + } else if (eapType == TTLS) { m_secuWidget->updateTtlsChange(m_info.ttlsInfo); m_wirelessConnOpration->addAndActiveWirelessEnterPriseTtlsConnect(m_info.ttlsInfo, connSettingInfo, m_devName, true); + } else if (eapType == LEAP) { + m_secuWidget->updateLeapChange(m_info.leapInfo); + m_wirelessConnOpration->addAndActiveWirelessEnterPriseLeapConnect(m_info.leapInfo, connSettingInfo, m_devName, true); + } else if (eapType == PWD) { + m_secuWidget->updatePwdChange(m_info.pwdInfo); + m_wirelessConnOpration->addAndActiveWirelessEnterPrisePwdConnect(m_info.pwdInfo, connSettingInfo, m_devName, true); + } else if (eapType == FAST) { + m_secuWidget->updateFastChange(m_info.fastInfo); + m_wirelessConnOpration->addAndActiveWirelessEnterPriseFastConnect(m_info.fastInfo, connSettingInfo, m_devName, true); } } else { m_secuWidget->updateSecurityChange(connSettingInfo); @@ -242,9 +251,9 @@ void JoinHiddenWiFiPage::onSecuTypeChanged(const KySecuType &type) void JoinHiddenWiFiPage::onEapTypeChanged(const KyEapMethodType &type) { - if (type == KyEapMethodType::TLS) { + if (type == KyEapMethodType::TLS || type == KyEapMethodType::FAST) { this->setFixedHeight(TLS_WINDOW_HEIGHT); - } else if (type == KyEapMethodType::PEAP || type == KyEapMethodType::TTLS) { + } else { this->setFixedHeight(PEAP_WINDOW_HEIGHT); } } diff --git a/src/frontend/netdetails/netdetail.cpp b/src/frontend/netdetails/netdetail.cpp index c3df56fc..bcfa00f6 100644 --- a/src/frontend/netdetails/netdetail.cpp +++ b/src/frontend/netdetails/netdetail.cpp @@ -528,6 +528,8 @@ void NetDetail::pagePadding(QString netName, bool isWlan) securityPage->setPwdInfo(m_info.pwdInfo); } else if (m_info.enterpriseType == FAST) { securityPage->setFastInfo(m_info.fastInfo); + } else { + qWarning() << "[NetDetail] unknown enterprise connection type" << m_info.enterpriseType; } } } @@ -746,6 +748,8 @@ void NetDetail::initSecuData() initPwdInfo(m_info); } else if (m_info.enterpriseType == FAST){ initFastInfo(m_info); + } else { + qWarning() << "[NetDetail] unknown enterprise connection type" << m_info.enterpriseType; } break; default: @@ -907,6 +911,8 @@ void NetDetail::updateWirelessEnterPriseConnect(KyEapMethodType enterpriseType) } else if (enterpriseType == FAST) { securityPage->updateFastChange(m_info.fastInfo); m_wirelessConnOpration->updateWirelessEnterPriseFastConnect(m_uuid, m_info.fastInfo); + } else { + qWarning() << "[NetDetail] unknow enterprise connection type"; } } @@ -1039,6 +1045,8 @@ bool NetDetail::createWirelessConnect() qDebug() << "addAndConnect FAST connect"; m_wirelessConnOpration->addAndActiveWirelessEnterPriseFastConnect(m_info.fastInfo, connetSetting, m_deviceName, true); } + } else { + qWarning() << "[NetDetail] unknown enterprise connection type" << enterpriseType; } } else { securityPage->updateSecurityChange(connetSetting);