From 72ac24f2e8ec5a260021bf96d4ce74444f90e9ce Mon Sep 17 00:00:00 2001
From: Pawel Olejniczak <pawel.olejniczak@mudita.com>
Date: Wed, 10 Mar 2021 13:13:08 +0100
Subject: [PATCH] [EGD-6073] Fix text formatting in retry windows

Error message in retry windows was displayed incorrectly.
---
 image/assets/lang/English.json                           | 8 ++++----
 .../application-settings-new/ApplicationSettings.cpp     | 6 +++---
 .../Bluetooth/interface/profiles/GAP/GAP.cpp             | 3 +--
 .../service-bluetooth/BluetoothMessage.hpp               | 9 ++-------
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json
index d6df35569695c4f01b2f7a0418ace4e35d57400b..a0231037da52b274bb6fa637e66eaf747e79826f 100644
--- a/image/assets/lang/English.json
+++ b/image/assets/lang/English.json
@@ -324,10 +324,10 @@
   "app_settings_bluetooth_phone_name": "Phone name",
   "app_settings_bluetooth_phone_visibility": "Phone visibility",
   "app_settings_bluetooth_enter_passkey": "Enter passkey:",
-  "app_settings_bluetooth_init_error_message": "<text font='gt_pressura' weight='regular' size='27'>Bluetooth initialization process has failed. </text> <text font='gt_pressura' weight='bold' size='27'>TRY AGAIN.</text>",
-  "app_settings_bluetooth_pairing_error_message": "<text font='gt_pressura' weight='regular' size='27'>Pairing process has failed. Check the device and</text> <text font='gt_pressura' weight='bold' size='27'>TRY AGAIN.</text>",
-  "app_settings_bluetooth_unpairing_error_message": "<text font='gt_pressura' weight='regular' size='27'>Unpairing process has failed. Check the device and</text> <text font='gt_pressura' weight='bold' size='27'>TRY AGAIN.</text>",
-  "app_settings_bluetooth_connecting_error_message": "<text font='gt_pressura' weight='regular' size='27'>Connection process has failed. Check the device and</text> <text font='gt_pressura' weight='bold' size='27'>TRY AGAIN.</text>",
+  "app_settings_bluetooth_init_error_message": "<text font='gt_pressura' weight='regular' size='27'>Bluetooth initialization process has failed.</text>",
+  "app_settings_bluetooth_pairing_error_message": "<text font='gt_pressura' weight='regular' size='27'>Pairing process has failed.<br></br>Check the device and </text> <text font='gt_pressura' weight='bold' size='27'>TRY AGAIN.</text>",
+  "app_settings_bluetooth_unpairing_error_message": "<text font='gt_pressura' weight='regular' size='27'>Unpairing process has failed.<br></br>Check the device and </text> <text font='gt_pressura' weight='bold' size='27'>TRY AGAIN.</text>",
+  "app_settings_bluetooth_connecting_error_message": "<text font='gt_pressura' weight='regular' size='27'>Connection process has failed.<br></br>Check the device and </text> <text font='gt_pressura' weight='bold' size='27'>TRY AGAIN.</text>",
   "app_settings_net": "Network",
   "app_settings_disp_key": "Display and keypad",
   "app_settings_display_display_light": "Display light",
diff --git a/module-apps/application-settings-new/ApplicationSettings.cpp b/module-apps/application-settings-new/ApplicationSettings.cpp
index f4d9b5aa1ce78a38eb3a2ba4a767aae31c034711..48269dea5c394e8242d16f26d3f7078a5ab2db9d 100644
--- a/module-apps/application-settings-new/ApplicationSettings.cpp
+++ b/module-apps/application-settings-new/ApplicationSettings.cpp
@@ -190,7 +190,7 @@ namespace app
                          gui::ShowMode::GUI_SHOW_INIT,
                          std::make_unique<gui::DialogMetadataMessage>(
                              gui::DialogMetadata{utils::localize.get("app_settings_bt"),
-                                                 "search_big",
+                                                 "info_big_circle_W_G",
                                                  utils::localize.get("app_settings_bluetooth_pairing_error_message"),
                                                  "",
                                                  [=]() -> bool {
@@ -220,7 +220,7 @@ namespace app
                          gui::ShowMode::GUI_SHOW_INIT,
                          std::make_unique<gui::DialogMetadataMessage>(
                              gui::DialogMetadata{utils::localize.get("app_settings_bt"),
-                                                 "search_big",
+                                                 "info_big_circle_W_G",
                                                  utils::localize.get("app_settings_bluetooth_unpairing_error_message"),
                                                  "",
                                                  [=]() -> bool {
@@ -244,7 +244,7 @@ namespace app
                          gui::ShowMode::GUI_SHOW_INIT,
                          std::make_unique<gui::DialogMetadataMessage>(gui::DialogMetadata{
                              utils::localize.get("app_settings_bt"),
-                             "search_big",
+                             "info_big_circle_W_G",
                              utils::localize.get("app_settings_bluetooth_connecting_error_message"),
                              "",
                              [=]() -> bool {
diff --git a/module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp b/module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp
index b4c37814a11ddb9bb30a18a60ceb37a71174bd72..7575588a0fa1fb0ad136a8adc66cc581ffc672c1 100644
--- a/module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp
+++ b/module-bluetooth/Bluetooth/interface/profiles/GAP/GAP.cpp
@@ -200,8 +200,7 @@ namespace bluetooth
     {
         auto result = packet[2];
 
-        auto msg =
-            std::make_shared<BluetoothPairResultMessage>(currentlyProcessedDeviceAddr, std::string{}, result == 0u);
+        auto msg = std::make_shared<BluetoothPairResultMessage>(currentlyProcessedDeviceAddr, result == 0u);
         currentlyProcessedDeviceAddr.clear();
         ownerService->bus.sendUnicast(std::move(msg), "ApplicationSettingsNew");
     }
diff --git a/module-services/service-bluetooth/service-bluetooth/BluetoothMessage.hpp b/module-services/service-bluetooth/service-bluetooth/BluetoothMessage.hpp
index 3e6aa9707fd3214bb60adb9c14a46e2985289860..f92b64a60702ddec779153e898d31723a7c416fd 100644
--- a/module-services/service-bluetooth/service-bluetooth/BluetoothMessage.hpp
+++ b/module-services/service-bluetooth/service-bluetooth/BluetoothMessage.hpp
@@ -58,18 +58,13 @@ class BluetoothScanResultMessage : public sys::DataMessage
 class BluetoothPairResultMessage : public sys::DataMessage
 {
   public:
-    explicit BluetoothPairResultMessage(std::string addr, std::string name, bool succeed)
-        : sys::DataMessage(MessageType::BluetoothPairResult), addr(std::move(addr)), name(std::move(name)),
-          succeed(succeed)
+    explicit BluetoothPairResultMessage(std::string addr, bool succeed)
+        : sys::DataMessage(MessageType::BluetoothPairResult), addr(std::move(addr)), succeed(succeed)
     {}
     [[nodiscard]] auto getAddr() const -> std::string
     {
         return addr;
     }
-    [[nodiscard]] auto getName() const -> std::string
-    {
-        return name;
-    }
     [[nodiscard]] auto isSucceed() const noexcept -> bool
     {
         return succeed;