Fix bluetooth setting not actually changing bluetooth radio settings.

The bluetooth setting options for changing between Enabled and Disabled
wasn't actually turning the bluetooth radio on and off.

Author: JustScott

src/displayapp/DisplayApp.cpp

@@ -522,7 +522,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
       currentScreen = std::make_unique<Screens::SettingShakeThreshold>(settingsController, motionController, *systemTask);
       break;
     case Apps::SettingBluetooth:
-      currentScreen = std::make_unique<Screens::SettingBluetooth>(this, settingsController);
+      currentScreen = std::make_unique<Screens::SettingBluetooth>(this, settingsController, bleController);
       break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(batteryController);

src/displayapp/screens/settings/SettingBluetooth.cpp

@@ -34,19 +34,25 @@ namespace {
   };
 }
 
-SettingBluetooth::SettingBluetooth(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+SettingBluetooth::SettingBluetooth(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController, const Pinetime::Controllers::Ble& bleController)
   : app {app},
     checkboxList(
       0,
       1,
       "Bluetooth",
       Symbols::bluetooth,
-      settingsController.GetBleRadioEnabled() ? 0 : 1,
-      [&settings = settingsController](uint32_t index) {
-        const bool priorMode = settings.GetBleRadioEnabled();
-        const bool newMode = options[index].radioEnabled;
-        if (newMode != priorMode) {
-          settings.SetBleRadioEnabled(newMode);
+      bleController.IsRadioEnabled() ? 0 : 1,
+      [&settings = settingsController, ble = bleController](uint32_t index) mutable {
+        // If bluetooth is on and the user chooses to turn it off
+        if (ble.IsRadioEnabled() && !options[index].radioEnabled && options[index].name[0] == 'D') {
+          ble.DisableRadio();
+          // Not sure if this is needed, leaving incase it's used elsewhere
+          settings.SetBleRadioEnabled(false); 
+        // If bluetooth is off and the user chooses to turn it on
+        } else if (!ble.IsRadioEnabled() && options[index].radioEnabled && options[index].name[0] == 'E'){
+          ble.EnableRadio();
+          // Not sure if this is needed, leaving incase it's used elsewhere
+          settings.SetBleRadioEnabled(true);
         }
       },
       CreateOptionArray()) {

src/displayapp/screens/settings/SettingBluetooth.h

@@ -5,6 +5,7 @@
 #include <lvgl/lvgl.h>
 
 #include "components/settings/Settings.h"
+#include "components/ble/BleController.h"
 #include "displayapp/screens/Screen.h"
 #include "displayapp/screens/CheckboxList.h"
 
@@ -15,7 +16,7 @@ namespace Pinetime {
 
       class SettingBluetooth : public Screen {
       public:
-        SettingBluetooth(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+        SettingBluetooth(DisplayApp* app, Pinetime::Controllers::Settings& settingsController, const Pinetime::Controllers::Ble& bleController);
         ~SettingBluetooth() override;
 
       private: