2 files changed, 13 insertions(+), 3 deletions(-)

M module-apps/application-settings/ApplicationSettings.cpp
M module-apps/application-settings/presenter/system/SARInfoWindowPresenter.cpp

@@ 548,7 548,9 @@ namespace app
             return std::make_unique<gui::CertificationWindow>(app);
         });
         windowsFactory.attach(gui::window::name::sar, [&](ApplicationCommon *app, const std::string &name) {
-            auto sarInfoRepository = std::make_unique<SARInfoRepository>("assets/certification_info", "sar.txt");
+            const auto path        = purefs::dir::getSystemDataDirPath() / "certification_info";
+            const auto filename    = "sar.txt";
+            auto sarInfoRepository = std::make_unique<SARInfoRepository>(path, filename);
             auto presenter         = std::make_unique<SARInfoWindowPresenter>(std::move(sarInfoRepository));
             return std::make_unique<gui::SARInfoWindow>(app, std::move(presenter));
         });

@@ 1,7 1,8 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SARInfoWindowPresenter.hpp"
+#include <log/log.hpp>
 
 SARInfoWindowPresenter::SARInfoWindowPresenter(std::unique_ptr<AbstractSARInfoRepository> &&sarInfoRepository)
     : sarInfoRepository{std::move(sarInfoRepository)}


@@ 9,5 10,12 @@ SARInfoWindowPresenter::SARInfoWindowPresenter(std::unique_ptr<AbstractSARInfoRe
 
 std::string SARInfoWindowPresenter::getSarInfo()
 {
-    return sarInfoRepository->getSarInfoText();
+    try {
+        const auto sarInfoText = sarInfoRepository->getSarInfoText();
+        return sarInfoText;
+    }
+    catch (const std::runtime_error &e) {
+        LOG_ERROR("Failed to get SAR info text! Error: %s", e.what());
+        return "";
+    }
 }