From d3e5410407cbff5db66d88462a4799927d05ce82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Thu, 14 Mar 2024 20:51:24 +0100
Subject: [PATCH] Emit the message BleRadioEnableToggle to DisplayApp only if
 the enable state of the radio has actually changed. This fixes an issue where
 the BLE connected logo would disappear when opening and closing the BLE
 setting (without changing it) while InfiniTime was already connected to a
 companion app.

Co-authored-by: JustScott <development@justscott.me>
---
 src/displayapp/screens/settings/SettingBluetooth.cpp | 6 +++---
 src/displayapp/screens/settings/SettingBluetooth.h   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/displayapp/screens/settings/SettingBluetooth.cpp b/src/displayapp/screens/settings/SettingBluetooth.cpp
index 82c3dee1..e4dc695c 100644
--- a/src/displayapp/screens/settings/SettingBluetooth.cpp
+++ b/src/displayapp/screens/settings/SettingBluetooth.cpp
@@ -36,17 +36,19 @@ namespace {
 
 SettingBluetooth::SettingBluetooth(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
   : app {app},
+    settings {settingsController},
     checkboxList(
       0,
       1,
       "Bluetooth",
       Symbols::bluetooth,
       settingsController.GetBleRadioEnabled() ? 0 : 1,
-      [&settings = settingsController](uint32_t index) {
+      [this](uint32_t index) {
         const bool priorMode = settings.GetBleRadioEnabled();
         const bool newMode = options[index].radioEnabled;
         if (newMode != priorMode) {
           settings.SetBleRadioEnabled(newMode);
+          this->app->PushMessage(Pinetime::Applications::Display::Messages::BleRadioEnableToggle);
         }
       },
       CreateOptionArray()) {
@@ -54,6 +56,4 @@ SettingBluetooth::SettingBluetooth(Pinetime::Applications::DisplayApp* app, Pine
 
 SettingBluetooth::~SettingBluetooth() {
   lv_obj_clean(lv_scr_act());
-  // Pushing the message in the OnValueChanged function causes a freeze?
-  app->PushMessage(Pinetime::Applications::Display::Messages::BleRadioEnableToggle);
 }
diff --git a/src/displayapp/screens/settings/SettingBluetooth.h b/src/displayapp/screens/settings/SettingBluetooth.h
index 1e3f9b81..0cf014f5 100644
--- a/src/displayapp/screens/settings/SettingBluetooth.h
+++ b/src/displayapp/screens/settings/SettingBluetooth.h
@@ -20,6 +20,7 @@ namespace Pinetime {
 
       private:
         DisplayApp* app;
+        Pinetime::Controllers::Settings& settings;
         CheckboxList checkboxList;
       };
     }