6 files changed, 8 insertions(+), 7 deletions(-)

M .idea/modules.xml
M module-bluetooth/Bluetooth/BluetoothWorker.cpp
M module-bluetooth/Bluetooth/interface/profiles/HFP/HFP.cpp
M module-bluetooth/Bluetooth/interface/profiles/HFP/HFPImpl.hpp
M module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp
M module-bluetooth/Bluetooth/interface/profiles/HSP/HSPImpl.hpp

@@ 2,6 2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/PureOS.iml" filepath="$PROJECT_DIR$/.idea/PureOS.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/PurePhone.iml" filepath="$PROJECT_DIR$/.idea/PurePhone.iml" />
     </modules>
   </component>

@@ 54,7 54,7 @@ namespace
             auto settingsName = std::get<std::string>(settings->getValue(bluetooth::Settings::DeviceName));
             if (settingsName.empty()) {
                 LOG_WARN("Settings name is empty!");
-                constexpr auto name = "PurePhone";
+                constexpr auto name = "Mudita Pure";
                 settings->setValue(bluetooth::Settings::DeviceName, name);
                 settingsName = name;
             }

@@ 112,7 112,7 @@ namespace bluetooth
     std::unique_ptr<CellularInterface> HFP::HFPImpl::cellularInterface = nullptr;
     std::unique_ptr<AudioInterface> HFP::HFPImpl::audioInterface       = nullptr;
     const sys::Service *HFP::HFPImpl::ownerService;
-    std::string HFP::HFPImpl::agServiceName = "PurePhone HFP";
+    const std::string_view HFP::HFPImpl::agServiceName = "Mudita Pure HFP";
     SCOCodec HFP::HFPImpl::codec            = SCOCodec::CVSD;
     std::shared_ptr<CVSDAudioDevice> HFP::HFPImpl::audioDevice;
 


@@ 356,7 356,7 @@ namespace bluetooth
         hfp_ag_create_sdp_record(serviceBuffer.data(),
                                  hspSdpRecordHandle,
                                  rfcommChannelNr,
-                                 agServiceName.c_str(),
+                                 agServiceName.data(),
                                  0,
                                  supported_features,
                                  wide_band_speech);

@@ 40,7 40,7 @@ namespace bluetooth
         static void dump_supported_codecs(void);
         static std::array<uint8_t, serviceBufferLength> serviceBuffer;
         static constexpr uint8_t rfcommChannelNr = 1;
-        static std::string agServiceName;
+        static const std::string_view agServiceName;
         static hci_con_handle_t scoHandle;
         static hci_con_handle_t aclHandle;
         static std::unique_ptr<SCO> sco;

@@ 106,7 106,7 @@ namespace bluetooth
     std::unique_ptr<CellularInterface> HSP::HSPImpl::cellularInterface = nullptr;
     std::unique_ptr<AudioInterface> HSP::HSPImpl::audioInterface       = nullptr;
     const sys::Service *HSP::HSPImpl::ownerService;
-    std::string HSP::HSPImpl::agServiceName = "PurePhone HSP";
+    const std::string_view HSP::HSPImpl::agServiceName = "Mudita Pure HSP";
     bool HSP::HSPImpl::isConnected          = false;
     bool HSP::HSPImpl::callAnswered         = false;
     bool HSP::HSPImpl::isRinging            = false;


@@ 288,7 288,7 @@ namespace bluetooth
 
         serviceBuffer.fill(0);
         constexpr uint32_t hspSdpRecordHandle = 0x10004;
-        hsp_ag_create_sdp_record(serviceBuffer.data(), hspSdpRecordHandle, rfcommChannelNr, agServiceName.c_str());
+        hsp_ag_create_sdp_record(serviceBuffer.data(), hspSdpRecordHandle, rfcommChannelNr, agServiceName.data());
 
         if (const auto status = sdp_register_service(serviceBuffer.data()); status != ERROR_CODE_SUCCESS) {
             LOG_ERROR("Can't register service. Status %x", status);

@@ 36,7 36,7 @@ namespace bluetooth
         static void establishAudioConnection();
         static std::array<uint8_t, serviceBufferLength> serviceBuffer;
         static constexpr uint8_t rfcommChannelNr = 1;
-        static std::string agServiceName;
+        static const std::string_view agServiceName;
         static uint16_t scoHandle;
         static std::unique_ptr<SCO> sco;
         static std::unique_ptr<CellularInterface> cellularInterface;