fix: crash because NetworkDevice has been deleted in network library

https://tower.im/teams/9487/todos/225916/

Change-Id: I390dbcc44b8754d6ebe0d05269a6c84c243c6a8e

plugins/network/item/applet/wirelesslist.cpp

@@ -146,6 +146,10 @@ void WirelessList::APRemoved(const QJsonObject &apInfo)
 
 void WirelessList::setDeviceInfo(const int index)
 {
+    if (m_device.isNull()) {
+        return;
+    }
+
     // set device enable state
     m_controlPanel->setDeviceEnabled(m_device->enabled());
 
@@ -158,6 +162,10 @@ void WirelessList::setDeviceInfo(const int index)
 
 void WirelessList::loadAPList()
 {
+    if (m_device.isNull()) {
+        return;
+    }
+
     for (auto item : m_device->apList()) {
         AccessPoint ap(item.toObject());
         const auto mIndex = m_apList.indexOf(ap);
@@ -191,6 +199,10 @@ void WirelessList::updateAPList()
 {
     Q_ASSERT(sender() == m_updateAPTimer);
 
+    if (m_device.isNull()) {
+        return;
+    }
+
     int avaliableAPCount = 0;
 
     //if (m_networkInter->IsDeviceEnabled(m_device.dbusPath()))
@@ -270,6 +282,10 @@ void WirelessList::updateAPList()
 
 void WirelessList::onEnableButtonToggle(const bool enable)
 {
+    if (m_device.isNull()) {
+        return;
+    }
+
     Q_EMIT requestSetDeviceEnable(m_device->path(), enable);
     m_updateAPTimer->start();
 }
@@ -282,6 +298,10 @@ void WirelessList::onDeviceEnableChanged(const bool enable)
 
 void WirelessList::activateAP(const QString &apPath, const QString &ssid)
 {
+    if (m_device.isNull()) {
+        return;
+    }
+
     QString uuid;
 
     QList<QJsonObject> connections = m_device->connections();
@@ -301,6 +321,10 @@ void WirelessList::activateAP(const QString &apPath, const QString &ssid)
 
 void WirelessList::deactiveAP()
 {
+    if (m_device.isNull()) {
+        return;
+    }
+
     Q_EMIT requestDeactiveAP(m_device->path());
 }
 
@@ -320,6 +344,10 @@ void WirelessList::updateIndicatorPos()
 
 void WirelessList::onActiveConnectionChanged()
 {
+    if (m_device.isNull()) {
+        return;
+    }
+
     // 在这个方法中需要通过m_device->activeApSsid()的信息设置m_activeAP的值
     // m_activeAP的值应该从m_apList中拿到，但在程序第一次启动后，当后端扫描无线网的数据还没有发过来，
     // 这时m_device中的ap list为空，导致本类初始化时调用loadAPList()后m_apList也是空的，
@@ -341,6 +369,10 @@ void WirelessList::onActiveConnectionChanged()
 
 void WirelessList::onActivateApFailed(const QString &apPath, const QString &uuid)
 {
+    if (m_device.isNull()) {
+        return;
+    }
+
     if (m_currentClickAP.path() == apPath) {
         qDebug() << "wireless connect failed and may require more configuration,"
             << "path:" << m_currentClickAP.path() << "ssid" << m_currentClickAP.ssid()

plugins/network/item/applet/wirelesslist.h

@@ -29,6 +29,7 @@
 #include <QVBoxLayout>
 #include <QList>
 #include <QTimer>
+#include <QPointer>
 
 #include <dpicturesequenceview.h>
 #include <WirelessDevice>
@@ -71,7 +72,7 @@ private slots:
 
 
 private:
-    dde::network::WirelessDevice *m_device;
+    QPointer<dde::network::WirelessDevice> m_device;
 
     AccessPoint m_activeAP;
     QList<AccessPoint> m_apList;

plugins/network/item/deviceitem.cpp

@@ -46,6 +46,10 @@ const QString DeviceItem::itemCommand() const
 
 const QString DeviceItem::itemContextMenu()
 {
+    if (m_device.isNull()) {
+        return QString();
+    }
+
     QList<QVariant> items;
     items.reserve(2);
 
@@ -79,6 +83,10 @@ QWidget *DeviceItem::itemTips()
 
 void DeviceItem::invokeMenuItem(const QString &menuId)
 {
+    if (m_device.isNull()) {
+        return;
+    }
+
     if (menuId == "settings")
         //QProcess::startDetached("dbus-send --print-reply --dest=com.deepin.dde.ControlCenter /com/deepin/dde/ControlCenter com.deepin.dde.ControlCenter.ShowModule \"string:network\"");
         DDBusSender()

plugins/network/item/deviceitem.h

@@ -23,6 +23,7 @@
 #define DEVICEITEM_H
 
 #include <QWidget>
+#include <QPointer>
 
 #include <NetworkDevice>
 
@@ -35,7 +36,7 @@ class DeviceItem : public QWidget
 
     const QString &path() const { return m_path; }
 
-    inline const dde::network::NetworkDevice * device() { return m_device; }
+    inline const QPointer<dde::network::NetworkDevice> device() { return m_device; }
 
     virtual void refreshIcon() = 0;
     virtual const QString itemCommand() const;
@@ -52,7 +53,7 @@ class DeviceItem : public QWidget
     QSize sizeHint() const;
 
 protected:
-    dde::network::NetworkDevice *m_device;
+    QPointer<dde::network::NetworkDevice> m_device;
 
 private:
     QString m_path;

plugins/network/item/wireditem.cpp

@@ -48,8 +48,8 @@ WiredItem::WiredItem(WiredDevice *device)
 
     connect(m_delayTimer, &QTimer::timeout, this, &WiredItem::reloadIcon);
     connect(m_device, static_cast<void (NetworkDevice::*)(NetworkDevice::DeviceStatus) const>(&NetworkDevice::statusChanged), this, &WiredItem::deviceStateChanged);
-    connect(static_cast<WiredDevice *>(m_device), &WiredDevice::connectionsChanged, this, &WiredItem::deviceStateChanged);
-    connect(static_cast<WiredDevice *>(m_device), &WiredDevice::activeConnectionChanged, this, &WiredItem::deviceStateChanged);
+    connect(static_cast<WiredDevice *>(m_device.data()), &WiredDevice::connectionsChanged, this, &WiredItem::deviceStateChanged);
+    connect(static_cast<WiredDevice *>(m_device.data()), &WiredDevice::activeConnectionChanged, this, &WiredItem::deviceStateChanged);
 
     QTimer::singleShot(0, this, &WiredItem::refreshTips);
     QTimer::singleShot(0, this, &WiredItem::refreshIcon);
@@ -113,6 +113,10 @@ void WiredItem::reloadIcon()
 {
     Q_ASSERT(sender() == m_delayTimer);
 
+    if (m_device.isNull()) {
+        return;
+    }
+
 //    const Dock::DisplayMode displayMode = qApp->property(PROP_DISPLAY_MODE).value<Dock::DisplayMode>();
     const Dock::DisplayMode displayMode = Dock::DisplayMode::Efficient;
     const auto ratio = qApp->devicePixelRatio();
@@ -190,14 +194,18 @@ void WiredItem::deviceStateChanged()
 
 void WiredItem::refreshTips()
 {
+    if (m_device.isNull()) {
+        return;
+    }
+
     m_itemTips->setText(m_device->statusStringDetail());
 
     if (NetworkPlugin::isConnectivity()) {
         do {
             if (m_device->status() != NetworkDevice::DeviceStatus::Activated) {
                 break;
             }
-            const QJsonObject info = static_cast<WiredDevice *>(m_device)->activeConnection();
+            const QJsonObject info = static_cast<WiredDevice *>(m_device.data())->activeConnection();
             if (!info.contains("Ip4"))
                 break;
             const QJsonObject ipv4 = info.value("Ip4").toObject();

plugins/network/item/wirelessitem.cpp

@@ -50,8 +50,8 @@ WirelessItem::WirelessItem(WirelessDevice *device)
 
     connect(m_refreshTimer, &QTimer::timeout, this, &WirelessItem::onRefreshTimeout);
     connect(m_device, static_cast<void (NetworkDevice::*) (const QString &statStr) const>(&NetworkDevice::statusChanged), this, &WirelessItem::deviceStateChanged);
-    connect(static_cast<WirelessDevice *>(m_device), &WirelessDevice::activeApInfoChanged, m_refreshTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
-    connect(static_cast<WirelessDevice *>(m_device), &WirelessDevice::activeConnectionChanged, m_refreshTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
+    connect(static_cast<WirelessDevice *>(m_device.data()), &WirelessDevice::activeApInfoChanged, m_refreshTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
+    connect(static_cast<WirelessDevice *>(m_device.data()), &WirelessDevice::activeConnectionChanged, m_refreshTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
 
     //QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
     QTimer::singleShot(0, this, &WirelessItem::refreshTips);
@@ -142,6 +142,10 @@ void WirelessItem::mousePressEvent(QMouseEvent *e)
 
 const QPixmap WirelessItem::iconPix(const Dock::DisplayMode displayMode, const int size)
 {
+    if (m_device.isNull()) {
+        return QPixmap();
+    }
+
     QString type;
     const auto state = m_device->status();
 
@@ -169,7 +173,7 @@ const QPixmap WirelessItem::iconPix(const Dock::DisplayMode displayMode, const i
             break;
         }
         case NetworkDevice::DeviceStatus::Activated: {
-            const auto &activeApInfo = static_cast<WirelessDevice *>(m_device)->activeApInfo();
+            const auto &activeApInfo = static_cast<WirelessDevice *>(m_device.data())->activeApInfo();
             if (activeApInfo.isEmpty()) {
                 strength = 100;
                 m_refreshTimer->start();
@@ -229,7 +233,7 @@ const QPixmap WirelessItem::cachedPix(const QString &key, const int size)
 
 void WirelessItem::init()
 {
-    m_APList = new WirelessList(static_cast<WirelessDevice *>(m_device));
+    m_APList = new WirelessList(static_cast<WirelessDevice *>(m_device.data()));
     m_APList->installEventFilter(this);
     m_APList->setObjectName("wireless-" + m_device->path());
 
@@ -265,14 +269,18 @@ void WirelessItem::refreshIcon()
 
 void WirelessItem::refreshTips()
 {
+    if (m_device.isNull()) {
+        return;
+    }
+
     m_wirelessTips->setText(m_device->statusStringDetail());
 
     if (NetworkPlugin::isConnectivity()) {
         do {
             if (m_device->status() != NetworkDevice::DeviceStatus::Activated) {
                 break;
             }
-            const QJsonObject info = static_cast<WirelessDevice *>(m_device)->activeConnectionInfo();
+            const QJsonObject info = static_cast<WirelessDevice *>(m_device.data())->activeConnectionInfo();
             if (!info.contains("Ip4"))
                 break;
             const QJsonObject ipv4 = info.value("Ip4").toObject();
@@ -294,7 +302,11 @@ void WirelessItem::onRefreshTimeout()
 {
     Q_ASSERT(sender() == m_refreshTimer);
 
-    WirelessDevice *dev = static_cast<WirelessDevice *>(m_device);
+    if (m_device.isNull()) {
+        return;
+    }
+
+    WirelessDevice *dev = static_cast<WirelessDevice *>(m_device.data());
     // the status is Activated and activeApInfo is empty if the hotspot status of this wireless device is enabled
     if (m_device->status() == NetworkDevice::Activated && dev->activeApInfo().isEmpty() && !dev->hotspotEnabled()) {
         Q_EMIT queryActiveConnInfo();

plugins/network/networkplugin.cpp

@@ -268,7 +268,7 @@ void NetworkPlugin::refreshWiredItemVisible()
     QList<WiredItem *> wiredItems;
 
     for (auto item : m_itemsMap.values()) {
-        if (item->device()->type() == NetworkDevice::Wireless) {
+        if (!item->device().isNull() && item->device()->type() == NetworkDevice::Wireless) {
             hasWireless = true;
         } else {
             wiredItems.append(static_cast<WiredItem *>(item));
@@ -280,7 +280,7 @@ void NetworkPlugin::refreshWiredItemVisible()
     }
 
     for (auto wiredItem : wiredItems) {
-        if (!wiredItem->device()->enabled()) {
+        if (!wiredItem->device().isNull() && !wiredItem->device()->enabled()) {
             m_proxyInter->itemRemoved(this, wiredItem->path());
         } else {
             m_proxyInter->itemAdded(this, wiredItem->path());