fix: DSL connection deletion signal processing error

caixr23 · caixr23 · commit e04e880d38db · 2025-07-07T16:15:07.000+08:00
DSL connection deletion signal processing error

pms: BUG-308553
diff --git a/dcc-network/qml/PageAppProxy.qml b/dcc-network/qml/PageAppProxy.qml
@@ -14,8 +14,8 @@ import org.deepin.dcc.network 1.0
 DccObject {
     id: root
     property var item: null
-    property bool proxyEnable: item.isEnabled
-    property var config: item.config
+    property bool proxyEnable: item && item.isEnabled
+    property var config: item ? item.config : {}
     property bool urlAlert: false
     property bool portAlert: false
 
diff --git a/net-view/operation/private/netmanagerthreadprivate.cpp b/net-view/operation/private/netmanagerthreadprivate.cpp
@@ -538,8 +538,7 @@ void NetManagerThreadPrivate::doInit()
         connect(ConfigSetting::instance(), &ConfigSetting::enableAirplaneModeChanged, this, &NetManagerThreadPrivate::getAirplaneModeEnabled);
         QDBusConnection::systemBus().connect("org.deepin.dde.Bluetooth1", "/org/deepin/dde/Bluetooth1", "org.deepin.dde.Bluetooth1", "AdapterAdded", this, SLOT(getAirplaneModeEnabled()));
         QDBusConnection::systemBus().connect("org.deepin.dde.Bluetooth1", "/org/deepin/dde/Bluetooth1", "org.deepin.dde.Bluetooth1", "AdapterRemoved", this, SLOT(getAirplaneModeEnabled()));
-        QDBusConnection::systemBus()
-                .connect("org.deepin.dde.AirplaneMode1", "/org/deepin/dde/AirplaneMode1", "org.freedesktop.DBus.Properties", "PropertiesChanged", this, SLOT(onAirplaneModeEnabledPropertiesChanged(QString, QVariantMap, QStringList)));
+        QDBusConnection::systemBus().connect("org.deepin.dde.AirplaneMode1", "/org/deepin/dde/AirplaneMode1", "org.freedesktop.DBus.Properties", "PropertiesChanged", this, SLOT(onAirplaneModeEnabledPropertiesChanged(QString, QVariantMap, QStringList)));
     }
     // DSL
     if (m_flags.testFlags(NetType::NetManagerFlag::Net_DSL)) {
@@ -1071,13 +1070,13 @@ void NetManagerThreadPrivate::doGetConnectInfo(const QString &id, NetType::NetIt
                         if (!dbusSettingsMap.isError() && dbusSettingsMap.value().contains("ipv6")) {
                             QVariantMap ipv6Data = dbusSettingsMap.value().value("ipv6");
                             QVariantMap ipv6Map = retParam["ipv6"].value<QVariantMap>();
-                            
+
                             // 处理IPv6 gateway
                             if (ipv6->method() == Ipv6Setting::Manual && ipv6Data.contains("gateway")) {
                                 QString gateway = ipv6Data.value("gateway").toString();
                                 ipv6Map.insert("gateway", gateway);
                             }
-                            
+
                             // 处理IPv6 DNS - 首先从NetworkManager设置中直接读取
                             const QList<QHostAddress> &ipv6DnsFromSettings = ipv6->dns();
                             if (!ipv6DnsFromSettings.isEmpty()) {
@@ -1099,7 +1098,7 @@ void NetManagerThreadPrivate::doGetConnectInfo(const QString &id, NetType::NetIt
                                     ipv6Map.insert("dns", ipv6DnsList);
                                 }
                             }
-                            
+
                             retParam["ipv6"] = ipv6Map;
                         }
 
@@ -1182,13 +1181,13 @@ void NetManagerThreadPrivate::doGetConnectInfo(const QString &id, NetType::NetIt
             if (!dbusSettingsReply.isError() && dbusSettingsReply.value().contains("ipv6")) {
                 QVariantMap ipv6Data = dbusSettingsReply.value().value("ipv6");
                 QVariantMap ipv6Map = retParam["ipv6"].value<QVariantMap>();
-                
+
                 // 处理IPv6 gateway
                 if (ipv6->method() == Ipv6Setting::Manual && ipv6Data.contains("gateway")) {
                     QString gateway = ipv6Data.value("gateway").toString();
                     ipv6Map.insert("gateway", gateway);
                 }
-                
+
                 // 处理IPv6 DNS - 首先从NetworkManager设置中直接读取
                 const QList<QHostAddress> &ipv6DnsFromSettings = ipv6->dns();
                 if (!ipv6DnsFromSettings.isEmpty()) {
@@ -1210,7 +1209,7 @@ void NetManagerThreadPrivate::doGetConnectInfo(const QString &id, NetType::NetIt
                         ipv6Map.insert("dns", ipv6DnsList);
                     }
                 }
-                
+
                 retParam["ipv6"] = ipv6Map;
             }
 
@@ -1487,7 +1486,7 @@ void NetManagerThreadPrivate::doSetConnectInfo(const QString &id, NetType::NetIt
         pSetting->setParent(map["pppoe"]["parent"].toString());
         pSetting->setInitialized(true);
     }
-    
+
     // 手动处理IPv6 DNS设置 - 确保正确初始化
     if (map.contains("ipv6")) {
         QVariant ipv6Variant = map["ipv6"];
@@ -1499,7 +1498,7 @@ void NetManagerThreadPrivate::doSetConnectInfo(const QString &id, NetType::NetIt
                     QStringList ipv6DnsStrings = dnsVariant.toStringList();
                     if (!ipv6DnsStrings.isEmpty()) {
                         NetworkManager::Ipv6Setting::Ptr ipv6Setting = settings->setting(Setting::SettingType::Ipv6).staticCast<NetworkManager::Ipv6Setting>();
-                        
+
                         // 转换字符串列表为QHostAddress列表
                         QList<QHostAddress> ipv6DnsAddresses;
                         for (const QString &dnsStr : ipv6DnsStrings) {
@@ -1508,11 +1507,11 @@ void NetManagerThreadPrivate::doSetConnectInfo(const QString &id, NetType::NetIt
                                 ipv6DnsAddresses.append(addr);
                             }
                         }
-                        
+
                         if (!ipv6DnsAddresses.isEmpty()) {
                             ipv6Setting->setDns(ipv6DnsAddresses);
                             ipv6Setting->setIgnoreAutoDns(true);
-                            ipv6Setting->setInitialized(true);  // 关键！确保设置被初始化
+                            ipv6Setting->setInitialized(true); // 关键！确保设置被初始化
                         }
                     }
                 }
@@ -2374,11 +2373,7 @@ void NetManagerThreadPrivate::onDSLAdded(const QList<DSLItem *> &dsls)
 void NetManagerThreadPrivate::onDSLRemoved(const QList<DSLItem *> &dsls)
 {
     for (auto &&item : dsls) {
-        NetConnectionItemPrivate *connItem = NetItemNew(ConnectionItem, item->connection()->path());
-        connItem->updatename(item->connection()->id());
-        connItem->updatestatus(toNetConnectionStatus(item->status()));
-        connItem->item()->moveToThread(m_parentThread);
-        Q_EMIT itemAdded("NetDSLControlItem", connItem);
+        Q_EMIT itemRemoved(item->connection()->path());
     }
 }
 
diff --git a/src/impl/networkmanager/dslcontrollernm.cpp b/src/impl/networkmanager/dslcontrollernm.cpp
@@ -129,9 +129,7 @@ void DSLController_NM::connectionAppeared(const NetworkManager::WiredDevice::Ptr
     });
 
     if (itConnection != connections.end()) {
-        DSLItem *dslItem = addPppoeConnection(wiredDevice, *itConnection);
-        if (dslItem)
-            Q_EMIT itemAdded({dslItem});
+        addPppoeConnection(wiredDevice, *itConnection);
     }
 }
 
@@ -188,7 +186,7 @@ DSLItem *DSLController_NM::addPppoeConnection(NetworkManager::WiredDevice::Ptr d
     std::sort(m_dslItems.begin(), m_dslItems.end(), [](DSLItem *item1, DSLItem *item2) {
         return item1->connection()->id() < item2->connection()->id();
     });
-
+    Q_EMIT itemAdded({item});
     return item;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -538,8 +538,7 @@ void NetManagerThreadPrivate::doInit()`
`538`	`538`	`connect(ConfigSetting::instance(), &ConfigSetting::enableAirplaneModeChanged, this, &NetManagerThreadPrivate::getAirplaneModeEnabled);`
`539`	`539`	`QDBusConnection::systemBus().connect("org.deepin.dde.Bluetooth1", "/org/deepin/dde/Bluetooth1", "org.deepin.dde.Bluetooth1", "AdapterAdded", this, SLOT(getAirplaneModeEnabled()));`
`540`	`540`	`QDBusConnection::systemBus().connect("org.deepin.dde.Bluetooth1", "/org/deepin/dde/Bluetooth1", "org.deepin.dde.Bluetooth1", "AdapterRemoved", this, SLOT(getAirplaneModeEnabled()));`
`541`		`- QDBusConnection::systemBus()`
`542`		`- .connect("org.deepin.dde.AirplaneMode1", "/org/deepin/dde/AirplaneMode1", "org.freedesktop.DBus.Properties", "PropertiesChanged", this, SLOT(onAirplaneModeEnabledPropertiesChanged(QString, QVariantMap, QStringList)));`
	`541`	`+ QDBusConnection::systemBus().connect("org.deepin.dde.AirplaneMode1", "/org/deepin/dde/AirplaneMode1", "org.freedesktop.DBus.Properties", "PropertiesChanged", this, SLOT(onAirplaneModeEnabledPropertiesChanged(QString, QVariantMap, QStringList)));`
`543`	`542`	`}`
`544`	`543`	`// DSL`
`545`	`544`	`if (m_flags.testFlags(NetType::NetManagerFlag::Net_DSL)) {`
`@@ -1071,13 +1070,13 @@ void NetManagerThreadPrivate::doGetConnectInfo(const QString &id, NetType::NetIt`
`1071`	`1070`	`if (!dbusSettingsMap.isError() && dbusSettingsMap.value().contains("ipv6")) {`
`1072`	`1071`	`QVariantMap ipv6Data = dbusSettingsMap.value().value("ipv6");`
`1073`	`1072`	`QVariantMap ipv6Map = retParam["ipv6"].value<QVariantMap>();`
`1074`		`-`
	`1073`	`+`
`1075`	`1074`	`// 处理IPv6 gateway`
`1076`	`1075`	`if (ipv6->method() == Ipv6Setting::Manual && ipv6Data.contains("gateway")) {`
`1077`	`1076`	`QString gateway = ipv6Data.value("gateway").toString();`
`1078`	`1077`	`ipv6Map.insert("gateway", gateway);`
`1079`	`1078`	`}`
`1080`		`-`
	`1079`	`+`
`1081`	`1080`	`// 处理IPv6 DNS - 首先从NetworkManager设置中直接读取`
`1082`	`1081`	`const QList<QHostAddress> &ipv6DnsFromSettings = ipv6->dns();`
`1083`	`1082`	`if (!ipv6DnsFromSettings.isEmpty()) {`
`@@ -1099,7 +1098,7 @@ void NetManagerThreadPrivate::doGetConnectInfo(const QString &id, NetType::NetIt`
`1099`	`1098`	`ipv6Map.insert("dns", ipv6DnsList);`
`1100`	`1099`	`}`
`1101`	`1100`	`}`
`1102`		`-`
	`1101`	`+`
`1103`	`1102`	`retParam["ipv6"] = ipv6Map;`
`1104`	`1103`	`}`
`1105`	`1104`
`@@ -1182,13 +1181,13 @@ void NetManagerThreadPrivate::doGetConnectInfo(const QString &id, NetType::NetIt`
`1182`	`1181`	`if (!dbusSettingsReply.isError() && dbusSettingsReply.value().contains("ipv6")) {`
`1183`	`1182`	`QVariantMap ipv6Data = dbusSettingsReply.value().value("ipv6");`
`1184`	`1183`	`QVariantMap ipv6Map = retParam["ipv6"].value<QVariantMap>();`
`1185`		`-`
	`1184`	`+`
`1186`	`1185`	`// 处理IPv6 gateway`
`1187`	`1186`	`if (ipv6->method() == Ipv6Setting::Manual && ipv6Data.contains("gateway")) {`
`1188`	`1187`	`QString gateway = ipv6Data.value("gateway").toString();`
`1189`	`1188`	`ipv6Map.insert("gateway", gateway);`
`1190`	`1189`	`}`
`1191`		`-`
	`1190`	`+`
`1192`	`1191`	`// 处理IPv6 DNS - 首先从NetworkManager设置中直接读取`
`1193`	`1192`	`const QList<QHostAddress> &ipv6DnsFromSettings = ipv6->dns();`
`1194`	`1193`	`if (!ipv6DnsFromSettings.isEmpty()) {`
`@@ -1210,7 +1209,7 @@ void NetManagerThreadPrivate::doGetConnectInfo(const QString &id, NetType::NetIt`
`1210`	`1209`	`ipv6Map.insert("dns", ipv6DnsList);`
`1211`	`1210`	`}`
`1212`	`1211`	`}`
`1213`		`-`
	`1212`	`+`
`1214`	`1213`	`retParam["ipv6"] = ipv6Map;`
`1215`	`1214`	`}`
`1216`	`1215`
`@@ -1487,7 +1486,7 @@ void NetManagerThreadPrivate::doSetConnectInfo(const QString &id, NetType::NetIt`
`1487`	`1486`	`pSetting->setParent(map["pppoe"]["parent"].toString());`
`1488`	`1487`	`pSetting->setInitialized(true);`
`1489`	`1488`	`}`
`1490`		`-`
	`1489`	`+`
`1491`	`1490`	`// 手动处理IPv6 DNS设置 - 确保正确初始化`
`1492`	`1491`	`if (map.contains("ipv6")) {`
`1493`	`1492`	`QVariant ipv6Variant = map["ipv6"];`
`@@ -1499,7 +1498,7 @@ void NetManagerThreadPrivate::doSetConnectInfo(const QString &id, NetType::NetIt`
`1499`	`1498`	`QStringList ipv6DnsStrings = dnsVariant.toStringList();`
`1500`	`1499`	`if (!ipv6DnsStrings.isEmpty()) {`
`1501`	`1500`	`NetworkManager::Ipv6Setting::Ptr ipv6Setting = settings->setting(Setting::SettingType::Ipv6).staticCast<NetworkManager::Ipv6Setting>();`
`1502`		`-`
	`1501`	`+`
`1503`	`1502`	`// 转换字符串列表为QHostAddress列表`
`1504`	`1503`	`QList<QHostAddress> ipv6DnsAddresses;`
`1505`	`1504`	`for (const QString &dnsStr : ipv6DnsStrings) {`
`@@ -1508,11 +1507,11 @@ void NetManagerThreadPrivate::doSetConnectInfo(const QString &id, NetType::NetIt`
`1508`	`1507`	`ipv6DnsAddresses.append(addr);`
`1509`	`1508`	`}`
`1510`	`1509`	`}`
`1511`		`-`
	`1510`	`+`
`1512`	`1511`	`if (!ipv6DnsAddresses.isEmpty()) {`
`1513`	`1512`	`ipv6Setting->setDns(ipv6DnsAddresses);`
`1514`	`1513`	`ipv6Setting->setIgnoreAutoDns(true);`
`1515`		`- ipv6Setting->setInitialized(true); // 关键！确保设置被初始化`
	`1514`	`+ ipv6Setting->setInitialized(true); // 关键！确保设置被初始化`
`1516`	`1515`	`}`
`1517`	`1516`	`}`
`1518`	`1517`	`}`
`@@ -2374,11 +2373,7 @@ void NetManagerThreadPrivate::onDSLAdded(const QList<DSLItem *> &dsls)`
`2374`	`2373`	`void NetManagerThreadPrivate::onDSLRemoved(const QList<DSLItem *> &dsls)`
`2375`	`2374`	`{`
`2376`	`2375`	`for (auto &&item : dsls) {`
`2377`		`- NetConnectionItemPrivate *connItem = NetItemNew(ConnectionItem, item->connection()->path());`
`2378`		`- connItem->updatename(item->connection()->id());`
`2379`		`- connItem->updatestatus(toNetConnectionStatus(item->status()));`
`2380`		`- connItem->item()->moveToThread(m_parentThread);`
`2381`		`- Q_EMIT itemAdded("NetDSLControlItem", connItem);`
	`2376`	`+ Q_EMIT itemRemoved(item->connection()->path());`
`2382`	`2377`	`}`
`2383`	`2378`	`}`
`2384`	`2379`
Original file line number	Diff line number	Diff line change
`@@ -129,9 +129,7 @@ void DSLController_NM::connectionAppeared(const NetworkManager::WiredDevice::Ptr`
`129`	`129`	`});`
`130`	`130`
`131`	`131`	`if (itConnection != connections.end()) {`
`132`		`- DSLItem dslItem = addPppoeConnection(wiredDevice, itConnection);`
`133`		`- if (dslItem)`
`134`		`- Q_EMIT itemAdded({dslItem});`
	`132`	`+ addPppoeConnection(wiredDevice, *itConnection);`
`135`	`133`	`}`
`136`	`134`	`}`
`137`	`135`
`@@ -188,7 +186,7 @@ DSLItem *DSLController_NM::addPppoeConnection(NetworkManager::WiredDevice::Ptr d`
`188`	`186`	`std::sort(m_dslItems.begin(), m_dslItems.end(), [](DSLItem item1, DSLItem item2) {`
`189`	`187`	`return item1->connection()->id() < item2->connection()->id();`
`190`	`188`	`});`
`191`		`-`
	`189`	`+ Q_EMIT itemAdded({item});`
`192`	`190`	`return item;`
`193`	`191`	`}`
`194`	`192`