Don't design Core::AirPods::Manager as a singleton class

Author: SpriteOvO

Source/Application.cpp

@@ -151,21 +151,15 @@ bool ApdApplication::Prepare()
     Core::OS::Windows::Winrt::Initialize();
 #endif
 
-    connect(this, &ApdApplication::aboutToQuit, this, &ApdApplication::QuitHandler);
     return true;
 }
 
 int ApdApplication::Run()
 {
-    Core::AirPods::StartScanner();
+    _mainWindow->GetApdMgr().StartScanner();
     return exec();
 }
 
-void ApdApplication::QuitHandler()
-{
-    Core::AirPods::OnQuit();
-}
-
 void ApdApplication::QuitSafety()
 {
     QMetaObject::invokeMethod(qApp, &QApplication::quit, Qt::QueuedConnection);

Source/Application.h

@@ -72,8 +72,6 @@ class ApdApplication : public SingleApplication
 
     static void InitSettings();
     static void FirstTimeUse();
-
-    void QuitHandler();
 };
 
 #define ApdApp (dynamic_cast<ApdApplication *>(QCoreApplication::instance()))

Source/Core/AirPods.cpp

@@ -357,6 +357,7 @@ void StateManager::DoStateReset(Side side)
         adv.reset();
     }
 }
+} // namespace Details
 
 //
 // Manager
@@ -395,12 +396,6 @@ void Manager::StopScanner()
     }
 }
 
-QString Manager::GetDisplayName()
-{
-    std::lock_guard<std::mutex> lock{_mutex};
-    return _displayName;
-}
-
 void Manager::OnRssiMinChanged(int16_t rssiMin)
 {
     std::lock_guard<std::mutex> lock{_mutex};
@@ -451,11 +446,6 @@ void Manager::OnBoundDeviceAddressChanged(uint64_t address)
     OnBoundDeviceConnectionStateChanged(currentState);
 }
 
-void Manager::OnQuit()
-{
-    StopScanner();
-}
-
 void Manager::OnBoundDeviceConnectionStateChanged(Bluetooth::DeviceState state)
 {
     bool newDeviceConnected = state == Bluetooth::DeviceState::Connected;
@@ -472,10 +462,12 @@ void Manager::OnBoundDeviceConnectionStateChanged(Bluetooth::DeviceState state)
     GlobalMedia::OnLimitedDeviceStateChanged((_displayName + " Stereo").toStdString());
 }
 
-void Manager::OnStateChanged(StateManager::UpdateEvent updateEvent)
+void Manager::OnStateChanged(Details::StateManager::UpdateEvent updateEvent)
 {
     const auto &oldState = updateEvent.oldState;
-    const auto &newState = updateEvent.newState;
+    auto &newState = updateEvent.newState;
+
+    newState.displayName = _displayName;
 
     ApdApp->GetMainWindow()->UpdateStateSafety(newState);
 
@@ -533,7 +525,7 @@ void Manager::OnBothInEar(bool isBothInEar)
 
 bool Manager::OnAdvertisementReceived(const Bluetooth::AdvertisementWatcher::ReceivedData &data)
 {
-    if (!Advertisement::IsDesiredAdv(data)) {
+    if (!Details::Advertisement::IsDesiredAdv(data)) {
         return false;
     }
 
@@ -542,12 +534,12 @@ bool Manager::OnAdvertisementReceived(const Bluetooth::AdvertisementWatcher::Rec
         return false;
     }
 
-    Advertisement adv{data};
+    Details::Advertisement adv{data};
 
     LOG(Trace, "AirPods advertisement received. Data: {}, Address Hash: {}, RSSI: {}",
         Helper::ToString(adv.GetDesensitizedData()), Helper::Hash(data.address), data.rssi);
 
-    auto optUpdateEvent = _stateMgr.OnAdvReceived(Advertisement{data});
+    auto optUpdateEvent = _stateMgr.OnAdvReceived(Details::Advertisement{data});
     if (optUpdateEvent.has_value()) {
         OnStateChanged(std::move(optUpdateEvent.value()));
     }
@@ -573,8 +565,6 @@ void Manager::OnAdvWatcherStateChanged(
     }
 }
 
-} // namespace Details
-
 std::vector<Bluetooth::Device> GetDevices()
 {
     std::vector<Bluetooth::Device> devices =

Source/Core/AirPods.h

@@ -62,6 +62,7 @@ struct State {
     Model model{Model::Unknown};
     PodsState pods;
     CaseState caseBox;
+    QString displayName;
 
     bool operator==(const State &rhs) const = default;
 };
@@ -140,49 +141,37 @@ class StateManager
     void DoLost();
     void DoStateReset(Side side);
 };
+} // namespace Details
 
-class Manager : public Helper::Singleton<Manager>
+class Manager
 {
-protected:
+public:
     Manager();
-    friend Helper::Singleton<Manager>;
 
-public:
     void StartScanner();
     void StopScanner();
 
-    QString GetDisplayName();
-
     void OnRssiMinChanged(int16_t rssiMin);
     void OnAutomaticEarDetectionChanged(bool enable);
     void OnBoundDeviceAddressChanged(uint64_t address);
-    void OnQuit();
 
 private:
+    std::mutex _mutex;
     Bluetooth::AdvertisementWatcher _adWatcher;
-    StateManager _stateMgr;
+    Details::StateManager _stateMgr;
     std::optional<Bluetooth::Device> _boundDevice;
     QString _displayName;
     bool _deviceConnected{false};
-    std::mutex _mutex;
     bool _automaticEarDetection{false};
 
     void OnBoundDeviceConnectionStateChanged(Bluetooth::DeviceState state);
-    void OnStateChanged(StateManager::UpdateEvent updateEvent);
+    void OnStateChanged(Details::StateManager::UpdateEvent updateEvent);
     void OnLidOpened(bool opened);
     void OnBothInEar(bool isBothInEar);
     bool OnAdvertisementReceived(const Bluetooth::AdvertisementWatcher::ReceivedData &data);
     void OnAdvWatcherStateChanged(
         Bluetooth::AdvertisementWatcher::State state, const std::optional<std::string> &optError);
 };
-} // namespace Details
-
-SINGLETON_EXPOSE_FUNCTION(Details::Manager, StartScanner)
-SINGLETON_EXPOSE_FUNCTION(Details::Manager, GetDisplayName)
-SINGLETON_EXPOSE_FUNCTION(Details::Manager, OnRssiMinChanged)
-SINGLETON_EXPOSE_FUNCTION(Details::Manager, OnAutomaticEarDetectionChanged)
-SINGLETON_EXPOSE_FUNCTION(Details::Manager, OnBoundDeviceAddressChanged)
-SINGLETON_EXPOSE_FUNCTION(Details::Manager, OnQuit)
 
 std::vector<Core::Bluetooth::Device> GetDevices();
 

Source/Core/Bluetooth_win.cpp

@@ -281,7 +281,12 @@ AdvertisementWatcher::AdvertisementWatcher()
 
 AdvertisementWatcher::~AdvertisementWatcher()
 {
-    Stop();
+    if (!_stop) {
+        _destroy = true;
+        Stop();
+        std::unique_lock<std::mutex> lock{_conVarMutex};
+        _destroyConVar.wait(lock);
+    }
 }
 
 bool AdvertisementWatcher::Start()
@@ -344,7 +349,6 @@ void AdvertisementWatcher::OnReceived(const BluetoothLEAdvertisementReceivedEven
 
 void AdvertisementWatcher::OnStopped(const BluetoothLEAdvertisementWatcherStoppedEventArgs &args)
 {
-
     static std::unordered_map<BluetoothError, std::string> errorReasons = {
         {BluetoothError::Success, "Success"},
         {BluetoothError::RadioNotAvailable, "RadioNotAvailable"},
@@ -390,9 +394,14 @@ void AdvertisementWatcher::OnStopped(const BluetoothLEAdvertisementWatcherStoppe
 
     CbStateChanged().Invoke(State::Stopped, optError);
 
-    do {
-        std::unique_lock<std::mutex> lock{_conVarMutex};
-        _stopConVar.wait_until(lock, _lastStartTime.load() + kRetryInterval);
-    } while (!_stop && !Start());
+    if (!_destroy) {
+        do {
+            std::unique_lock<std::mutex> lock{_conVarMutex};
+            _stopConVar.wait_until(lock, _lastStartTime.load() + kRetryInterval);
+        } while (!_stop && !Start());
+    }
+    else {
+        _destroyConVar.notify_all();
+    }
 }
 } // namespace Core::Bluetooth

Source/Core/Bluetooth_win.h

@@ -125,10 +125,10 @@ class AdvertisementWatcher final
     WinrtBlutoothAdv::BluetoothLEAdvertisementWatcher _bleWatcher;
     std::mutex _mutex;
 
-    std::atomic<bool> _stop{false};
+    std::atomic<bool> _stop{false}, _destroy{false};
     std::atomic<std::chrono::steady_clock::time_point> _lastStartTime;
     std::mutex _conVarMutex;
-    std::condition_variable _stopConVar;
+    std::condition_variable _stopConVar, _destroyConVar;
 
     void OnReceived(const WinrtBlutoothAdv::BluetoothLEAdvertisementReceivedEventArgs &args);
     void OnStopped(const WinrtBlutoothAdv::BluetoothLEAdvertisementWatcherStoppedEventArgs &args);

Source/Core/Settings.cpp

@@ -72,14 +72,15 @@ void OnApply_automatic_ear_detection(const Fields &newFields)
 {
     LOG(Info, "OnApply_automatic_ear_detection: {}", newFields.automatic_ear_detection);
 
-    AirPods::OnAutomaticEarDetectionChanged(newFields.automatic_ear_detection);
+    ApdApp->GetMainWindow()->GetApdMgr().OnAutomaticEarDetectionChanged(
+        newFields.automatic_ear_detection);
 }
 
 void OnApply_rssi_min(const Fields &newFields)
 {
     LOG(Info, "OnApply_rssi_min: {}", newFields.rssi_min);
 
-    AirPods::OnRssiMinChanged(newFields.rssi_min);
+    ApdApp->GetMainWindow()->GetApdMgr().OnRssiMinChanged(newFields.rssi_min);
 }
 
 void OnApply_reduce_loud_sounds(const Fields &newFields)
@@ -111,7 +112,7 @@ void OnApply_device_address(const Fields &newFields)
         ApdApp->GetMainWindow()->BindSafety();
     }
 
-    AirPods::OnBoundDeviceAddressChanged(newFields.device_address);
+    ApdApp->GetMainWindow()->GetApdMgr().OnBoundDeviceAddressChanged(newFields.device_address);
 }
 
 void OnApply_tray_icon_battery(const Fields &newFields)

Source/Gui/MainWindow.cpp

@@ -543,8 +543,7 @@ void MainWindow::Repaint()
 
     const auto &state = _cachedState.value();
 
-    // _ui.deviceLabel->setText(Helper::ToString(state.model));
-    _ui.deviceLabel->setText(Core::AirPods::GetDisplayName());
+    _ui.deviceLabel->setText(state.displayName);
 
     SetAnimation(state.model);
 

Source/Gui/MainWindow.h

@@ -50,6 +50,11 @@ class MainWindow : public QDialog
 public:
     MainWindow(QWidget *parent = nullptr);
 
+    inline auto &GetApdMgr()
+    {
+        return _apdMgr;
+    }
+
     void UpdateState(const Core::AirPods::State &state);
     void Available();
     void Unavailable();
@@ -83,6 +88,7 @@ class MainWindow : public QDialog
     Widget::Battery *_rightBattery = new Widget::Battery{this};
     Widget::Battery *_caseBattery = new Widget::Battery{this};
 
+    Core::AirPods::Manager _apdMgr;
     Core::Update::AsyncChecker _updateChecker{[this](auto &&...args) {
         VersionUpdateAvailableSafety(std::forward<decltype(args)>(args)...);
     }};

Source/Gui/TrayIcon.cpp

@@ -118,8 +118,7 @@ void TrayIcon::Repaint()
         }
         const auto &state = _airPodsState.value();
 
-        // toolTipContent += Helper::ToString(state.model);
-        toolTipContent += Core::AirPods::GetDisplayName();
+        toolTipContent += state.displayName;
 
         // clang-format off
         if (state.pods.left.battery.Available()) {