Skip to content

Commit d3aee5c

Browse files
ut003640deepin-bot[bot]
authored andcommitted
Revert "fix: Fix airplane mode tips display logic"
This reverts commit 95539e9.
1 parent 12836fe commit d3aee5c

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

net-view/operation/netmanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ void NetManagerPrivate::updateAirplaneMode(bool enabled)
10101010
Q_Q(NetManager);
10111011
Q_EMIT q->airplaneModeChanged(m_airplaneMode);
10121012
}
1013-
updateItemVisible("NetAirplaneModeTipsItem", enabled && m_managerThread->supportWireless());
1013+
updateItemVisible("NetAirplaneModeTipsItem", enabled);
10141014
if (enabled) {
10151015
updateItemVisible("NetWirelessDisabledItem", false);
10161016
updateItemVisible("NetWiredDisabledItem", false);

net-view/operation/private/netmanagerthreadprivate.cpp

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,6 @@ bool NetManagerThreadPrivate::CheckPasswordValid(const QString &key, const QStri
137137
return !password.isEmpty();
138138
}
139139

140-
bool NetManagerThreadPrivate::supportWireless() const
141-
{
142-
NetworkManager::Device::List devices = NetworkManager::networkInterfaces();
143-
for (NetworkManager::Device::Ptr device : devices) {
144-
if (device->type() == NetworkManager::Device::Type::Wifi && device->managed())
145-
return true;
146-
}
147-
148-
return false;
149-
}
150-
151140
void NetManagerThreadPrivate::getNetCheckAvailableFromDBus()
152141
{
153142
QDBusMessage message = QDBusMessage::createMethodCall("com.deepin.defender.netcheck", "/com/deepin/defender/netcheck", "org.freedesktop.DBus.Properties", "Get");
@@ -872,7 +861,13 @@ bool NetManagerThreadPrivate::supportAirplaneMode() const
872861
}
873862
}
874863

875-
return supportWireless();
864+
NetworkManager::Device::List devices = NetworkManager::networkInterfaces();
865+
for (NetworkManager::Device::Ptr device : devices) {
866+
if (device->type() == NetworkManager::Device::Type::Wifi && device->managed())
867+
return true;
868+
}
869+
870+
return false;
876871
}
877872

878873
void NetManagerThreadPrivate::doConnectOrInfo(const QString &id, NetType::NetItemType type, const QVariantMap &param)

net-view/operation/private/netmanagerthreadprivate.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ class NetManagerThreadPrivate : public QObject
5555

5656
inline bool AirplaneModeEnabled() const { return m_airplaneModeEnabled; }
5757

58-
bool supportWireless() const;
59-
6058
void setEnabled(bool enabled);
6159
void setAutoScanInterval(int ms);
6260
void setAutoScanEnabled(bool enabled);

0 commit comments

Comments
 (0)