fix: resolve WiFi connection notification issue on login screen

dss-network-plugin/networkmodule.cpp

@@ -50,8 +50,6 @@ NetworkModule::NetworkModule(QObject *parent)
     m_manager = new NetManager(flags, this);
     if (m_isLockModel) {
         m_manager->setServerKey("lock");
-        // m_manager->setServiceLoadForNM(false);
-        // m_manager->setMonitorNetworkNotify(false);
         QDBusConnection::sessionBus().connect("com.deepin.dde.lockFront", "/com/deepin/dde/lockFront", "com.deepin.dde.lockFront", "Visible", this, SLOT(updateLockScreenStatus(bool)));
         connect(m_manager,
                 &NetManager::networkNotify,

net-view/operation/netmanager.cpp

@@ -237,16 +237,6 @@ NetManagerPrivate::~NetManagerPrivate()
     m_dataMap.clear();
 }
 
-void NetManagerPrivate::setMonitorNetworkNotify(bool monitor)
-{
-    m_managerThread->setMonitorNetworkNotify(monitor);
-}
-
-void NetManagerPrivate::setUseSecretAgent(bool enabled)
-{
-    m_managerThread->setUseSecretAgent(enabled);
-}
-
 void NetManagerPrivate::setAutoScanInterval(int ms)
 {
     m_managerThread->setAutoScanInterval(ms);

net-view/operation/netmanager.h

@@ -29,12 +29,6 @@ class NetManager : public QObject
     void setServerKey(const QString &serverKey);
     Q_INVOKABLE static bool CheckPasswordValid(const QString &key, const QString &password);
 
-    // // void setServiceLoadForNM(bool isNM);        // 使用NM
-    // // void setMonitorNetworkNotify(bool monitor); // 发网络通知
-    // // void setUseSecretAgent(bool enabled);       // 实现密码代理
-    // // 以上设置需在init之前设置，不支持动态修改
-    // void init();
-
     enum ConnectionType { Unknown = 0, Adsl, Bluetooth, Bond, Bridge, Cdma, Gsm, Infiniband, OLPCMesh, Pppoe, Vlan, Vpn, Wimax, Wired, Wireless, Team, Generic, Tun, IpTunnel };
 
     void setAutoScanInterval(int ms);      // 设置自动扫描无线网间隔，0为不扫描

net-view/operation/private/netmanager_p.h

@@ -33,8 +33,6 @@ class NetManagerPrivate : public QObject
     explicit NetManagerPrivate(NetManager *manager);
     ~NetManagerPrivate() override;
 
-    void setMonitorNetworkNotify(bool monitor);
-    void setUseSecretAgent(bool enabled);
     void setAutoScanInterval(int ms);
     void setAutoScanEnabled(bool enabled);
     void setEnabled(bool enabled);

net-view/operation/private/netmanagerthreadprivate.cpp

@@ -87,8 +87,6 @@ NetManagerThreadPrivate::NetManagerThreadPrivate()
     : QObject()
     , m_thread(new QThread(this))
     , m_parentThread(QThread::currentThread())
-    , m_monitorNetworkNotify(false)
-    , m_useSecretAgent(true)
     , m_isInitialized(false)
     , m_enabled(true)
     , m_autoScanInterval(0)
@@ -180,20 +178,6 @@ AccessPoints *NetManagerThreadPrivate::fromApID(const QString &id)
     return ap;
 }
 
-void NetManagerThreadPrivate::setMonitorNetworkNotify(bool monitor)
-{
-    if (m_isInitialized)
-        return;
-    m_monitorNetworkNotify = monitor;
-}
-
-void NetManagerThreadPrivate::setUseSecretAgent(bool enabled)
-{
-    if (m_isInitialized)
-        return;
-    m_useSecretAgent = enabled;
-}
-
 void NetManagerThreadPrivate::setEnabled(bool enabled)
 {
     m_enabled = enabled;
@@ -380,7 +364,6 @@ void NetManagerThreadPrivate::doInit()
 {
     if (m_isInitialized)
         return;
-    m_isInitialized = true;
 
     qRegisterMetaType<NetworkManager::Device::State>("NetworkManager::Device::State");
     qRegisterMetaType<NetworkManager::Device::StateChangeReason>("NetworkManager::Device::StateChangeReason");
@@ -509,12 +492,10 @@ void NetManagerThreadPrivate::doInit()
         connect(networkController->proxyController(), &ProxyController::appPortChanged, this, &NetManagerThreadPrivate::onAppProxyChanged);
     }
 
-    m_isInitialized = true;
     m_netCheckAvailable = false;
     getNetCheckAvailableFromDBus();
 
     QDBusConnection::systemBus().connect("com.deepin.defender.netcheck", "/com/deepin/defender/netcheck", "org.freedesktop.DBus.Properties", "PropertiesChanged", this, SLOT(onNetCheckPropertiesChanged(QString, QVariantMap, QStringList)));
-
     QDBusConnection::systemBus().connect("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "PrepareForSleep", this, SLOT(onPrepareForSleep(bool)));
 
     // 优先网络
@@ -580,11 +561,12 @@ void NetManagerThreadPrivate::doInit()
         // connect(networkController, &NetworkController::connectivityChanged, this, &NetManagerThreadPrivate::updateDetails, Qt::QueuedConnection);
         connect(networkController, &NetworkController::activeConnectionChange, this, &NetManagerThreadPrivate::updateDetails, Qt::QueuedConnection);
     }
+    m_isInitialized = true;
     // 初始化的关键参数,保留格式
     qCInfo(DNC) << "Interface Version :" << INTERFACE_VERSION;
     qCInfo(DNC) << "Manager Flags     :" << m_flags;
     qCInfo(DNC) << "Service From NM   :" << m_flags.testFlag(NetType::NetManagerFlag::Net_ServiceNM) << "Config:" << ConfigSetting::instance()->serviceFromNetworkManager();
-    qCInfo(DNC) << "Use Secret Agent  :" << m_useSecretAgent;
+    qCInfo(DNC) << "Use Secret Agent  :" << m_flags.testFlag(NetType::NetManagerFlag::Net_UseSecretAgent);
     qCInfo(DNC) << "Secret Agent      :" << (dynamic_cast<QObject *>(m_secretAgent));
     qCInfo(DNC) << "Auto Scan Interval:" << m_autoScanInterval;
 }
@@ -2485,7 +2467,7 @@ void NetManagerThreadPrivate::doAutoScan()
 
 void NetManagerThreadPrivate::addDeviceNotify(const QString &path)
 {
-    if (!m_monitorNetworkNotify) {
+    if (!m_flags.testFlags(NetType::NetManagerFlag::Net_MonitorNotify)) {
         return;
     }
     Device::Ptr dev = NetworkManager::findNetworkInterface(path);
@@ -2497,7 +2479,7 @@ void NetManagerThreadPrivate::addDeviceNotify(const QString &path)
 void NetManagerThreadPrivate::onNotifyDeviceStatusChanged(NetworkManager::Device::State newState, NetworkManager::Device::State oldState, NetworkManager::Device::StateChangeReason reason)
 {
     qCInfo(DNC) << "On notify device status changed, new state: " << newState << ", old state: " << oldState << ", reason: " << reason;
-    if (!m_monitorNetworkNotify) {
+    if (!m_flags.testFlags(NetType::NetManagerFlag::Net_MonitorNotify)) {
         return;
     }
     auto *device = dynamic_cast<NetworkManager::Device *>(sender());

net-view/operation/private/netmanagerthreadprivate.h

@@ -53,9 +53,6 @@ class NetManagerThreadPrivate : public QObject
 
     inline bool AirplaneModeEnabled() { return m_airplaneModeEnabled; }
 
-    void setMonitorNetworkNotify(bool monitor);
-    void setUseSecretAgent(bool enabled);
-
     void setEnabled(bool enabled);
     void setAutoScanInterval(int ms);
     void setAutoScanEnabled(bool enabled);
@@ -269,8 +266,6 @@ protected Q_SLOTS:
     NetType::NetManagerFlags m_flags;
 
     // bool m_loadForNM;
-    bool m_monitorNetworkNotify;
-    bool m_useSecretAgent;
     bool m_isInitialized;
     bool m_enabled;
     int m_autoScanInterval;

src/networkcontroller.cpp

@@ -42,7 +42,7 @@ NetworkController::NetworkController()
     , m_hotspotController(Q_NULLPTR)
     , m_connectivityHandler(new ConnectivityHandler(this))
 {
-    Dtk::Core::loggerInstance()->logToGlobalInstance(DNC().categoryName(), true);
+    Dtk::Core::loggerInstance()->setDefaultCategory(DNC().categoryName());
     retranslate(QLocale().name());
 
     if (ConfigSetting::instance()->serviceFromNetworkManager()) {