1- // SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd.
1+ // SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
22//
33// SPDX-License-Identifier: GPL-3.0-or-later
44
@@ -18,6 +18,7 @@ AccessPointProxyNM::AccessPointProxyNM(NetworkManager::WirelessDevice::Ptr devic
1818 , m_strength(0 )
1919 , m_secured(false )
2020{
21+ updateSsid ();
2122 initState ();
2223 initConnection ();
2324 updateInfo ();
@@ -40,6 +41,7 @@ void AccessPointProxyNM::updateStatus(ConnectionStatus status)
4041void AccessPointProxyNM::updateNetwork (NetworkManager::WirelessNetwork::Ptr network)
4142{
4243 m_network = network;
44+ updateSsid ();
4345}
4446
4547bool AccessPointProxyNM::contains (const QString &uni) const
@@ -57,7 +59,7 @@ bool AccessPointProxyNM::contains(const QString &uni) const
5759
5860QString AccessPointProxyNM::ssid () const
5961{
60- return m_network-> ssid () ;
62+ return m_ssid ;
6163}
6264
6365int AccessPointProxyNM::strength () const
@@ -134,7 +136,7 @@ void AccessPointProxyNM::initState()
134136 if (wirelessSetting.isNull ())
135137 return ;
136138
137- if (wirelessSetting->ssid () != m_network-> ssid ())
139+ if (wirelessSetting->ssid () != ssid ())
138140 return ;
139141
140142 updateStatus (convertStateFromNetworkManager (activeConnection->state ()));
@@ -181,7 +183,7 @@ void AccessPointProxyNM::updateHiddenInfo()
181183 if (wirelessSetting.isNull ())
182184 return false ;
183185
184- return wirelessSetting->ssid () == m_network-> ssid ();
186+ return wirelessSetting->ssid () == ssid ();
185187 });
186188 // 如果没有找到连接,就是非隐藏网络
187189 if (itConnection == connections.end ())
@@ -195,6 +197,11 @@ void AccessPointProxyNM::updateHiddenInfo()
195197 qCDebug (DNC ) << " update accesspoint hidden info, ssid:" << m_isHidden << " , hidden:" << m_isHidden;
196198}
197199
200+ void AccessPointProxyNM::updateSsid ()
201+ {
202+ m_ssid = (m_network && m_network->referenceAccessPoint ()) ? decodeByteArray (m_network->referenceAccessPoint ()->rawSsid ()) : QString ();
203+ }
204+
198205void AccessPointProxyNM::onUpdateNetwork ()
199206{
200207 int strength = m_strength;
0 commit comments