10 files changed, 21 insertions(+), 17 deletions(-)

M module-services/service-desktop/ServiceDesktop.cpp
M module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpointCommon.cpp
M module-services/service-desktop/endpoints/include/endpoints/deviceInfo/DeviceInfoEndpointCommon.hpp
M module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
M module-vfs/paths/filesystem_paths.cpp
M module-vfs/paths/include/purefs/filesystem_paths.hpp
M products/BellHybrid/BellHybridMain.cpp
M products/BellHybrid/services/desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp
M products/PurePhone/PurePhoneMain.cpp
M products/PurePhone/services/desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp

@@ 362,3 362,8 @@ auto ServiceDesktop::handle(sevm::USBPlugEvent *msg) -> std::shared_ptr<sys::Mes
     }
     return sys::MessageNone{};
 }
+
+auto ServiceDesktop::getMtpPath() const noexcept -> std::filesystem::path
+{
+    return mtpRootPath;
+}

@@ 83,12 83,19 @@ namespace sdesktop::endpoints
 
     auto DeviceInfoEndpointCommon::requestLogsFlush() const -> void
     {
-        auto owner = dynamic_cast<ServiceDesktop *>(ownerServicePtr);
-        if (owner) {
+        if (const auto owner = dynamic_cast<ServiceDesktop *>(ownerServicePtr); owner != nullptr) {
             owner->requestLogsFlush();
         }
     }
 
+    auto DeviceInfoEndpointCommon::getMtpPath() const -> std::filesystem::path
+    {
+        if (const auto owner = dynamic_cast<ServiceDesktop *>(ownerServicePtr); owner != nullptr) {
+            return owner->getMtpPath();
+        }
+        return std::filesystem::path{};
+    }
+
     auto DeviceInfoEndpointCommon::fileListToJsonObject(const std::vector<std::string> &fileList) const
         -> json11::Json::object const
     {

@@ 8,7 8,7 @@
 
 #include <string>
 #include <tuple>
-
+#include <filesystem>
 #include <json11.hpp>
 
 namespace sdesktop::endpoints


@@ 30,6 30,7 @@ namespace sdesktop::endpoints
         auto requestLogsFlush() const -> void;
         auto getStorageStats(const std::string &path) -> std::tuple<long, long>;
         auto getStorageInfo() -> std::tuple<long, long, long>;
+        auto getMtpPath() const -> std::filesystem::path;
 
         explicit DeviceInfoEndpointCommon(sys::Service *ownerServicePtr) : Endpoint(ownerServicePtr)
         {

@@ 81,6 81,7 @@ class ServiceDesktop : public sys::Service
 
     auto getNotificationEntries() const -> std::vector<Outbox::NotificationEntry>;
     void removeNotificationEntries(const std::vector<uint32_t> &);
+    auto getMtpPath() const noexcept -> std::filesystem::path;
 
   private:
     std::unique_ptr<sdesktop::USBSecurityModel> usbSecurityModel;

@@ 80,14 80,6 @@ namespace purefs
         {
             return getSystemDiskPath() / PATH_VAR;
         }
-        std::filesystem::path getMusicPlayerPath() noexcept
-        {
-            return purefs::dir::getUserMediaPath() / "app/music_player";
-        }
-        std::filesystem::path getRelaxationPath() noexcept
-        {
-            return purefs::dir::getUserMediaPath() / "app/relaxation";
-        }
 
     } // namespace dir
 } // namespace purefs

@@ 21,8 21,6 @@ namespace purefs
         std::filesystem::path getAssetsDirPath() noexcept;
         std::filesystem::path getSystemDataDirPath() noexcept;
         std::filesystem::path getSystemVarDirPath() noexcept;
-        std::filesystem::path getMusicPlayerPath() noexcept;
-        std::filesystem::path getRelaxationPath() noexcept;
 
     } // namespace dir
 

@@ 82,7 82,7 @@ int main()
     systemServices.emplace_back(sys::CreatorFor<service::ServiceFileIndexer>(std::move(fileIndexerAudioPaths)));
     systemServices.emplace_back(sys::CreatorFor<ServiceDB>());
     systemServices.emplace_back(sys::CreatorFor<service::Audio>());
-    systemServices.emplace_back(sys::CreatorFor<ServiceDesktop>(purefs::dir::getRelaxationPath()));
+    systemServices.emplace_back(sys::CreatorFor<ServiceDesktop>(purefs::dir::getUserMediaPath() / "app/relaxation"));
     systemServices.emplace_back(sys::CreatorFor<stm::ServiceTime>(std::make_shared<alarms::AlarmOperationsFactory>()));
     systemServices.emplace_back(sys::CreatorFor<service::eink::ServiceEink>(service::eink::ExitAction::None));
     systemServices.emplace_back(

@@ 47,7 47,7 @@ namespace sdesktop::endpoints
              {json::updateFilePath, (purefs::dir::getTemporaryPath() / sdesktop::paths::updateFilename).string()},
              {json::backupFilePath, (purefs::dir::getTemporaryPath() / sdesktop::paths::backupFilename).string()},
              {json::syncFilePath, (purefs::dir::getTemporaryPath() / sdesktop::paths::syncFilename).string()},
-             {json::mtpPath, purefs::dir::getRelaxationPath().string()}}));
+             {json::mtpPath, getMtpPath().string()}}));
 
         return http::Code::OK;
     }

@@ 182,7 182,7 @@ int main()
     systemServices.emplace_back(sys::CreatorFor<ServiceBluetooth>());
 #endif
 #ifdef ENABLE_SERVICE_DESKTOP
-    systemServices.emplace_back(sys::CreatorFor<ServiceDesktop>(purefs::dir::getMusicPlayerPath()));
+    systemServices.emplace_back(sys::CreatorFor<ServiceDesktop>(purefs::dir::getUserMediaPath() / "app/music_player"));
 #endif
 #ifdef ENABLE_SERVICE_TIME
     systemServices.emplace_back(sys::CreatorFor<stm::ServiceTime>(std::make_shared<alarms::AlarmOperationsFactory>()));

@@ 62,7 62,7 @@ namespace sdesktop::endpoints
              {json::updateFilePath, (purefs::dir::getTemporaryPath() / sdesktop::paths::updateFilename).string()},
              {json::backupFilePath, (purefs::dir::getTemporaryPath() / sdesktop::paths::backupFilename).string()},
              {json::syncFilePath, (purefs::dir::getTemporaryPath() / sdesktop::paths::syncFilename).string()},
-             {json::mtpPath, purefs::dir::getMusicPlayerPath().string()},
+             {json::mtpPath, getMtpPath().string()},
              {json::deviceToken, getDeviceToken()}}));
 
         return http::Code::OK;