2 files changed, 6 insertions(+), 9 deletions(-)

M Jenkinsfile
M products/PurePhone/PurePhoneMain.cpp

@@ 38,6 38,7 @@ pipeline {
             }
             steps {
                 script{
+                    common.checkIfBranchIsRebased("false")
                     buildSteps.performChecks("false");
                 }
             }

@@ 174,20 174,12 @@ int main()
     systemServices.emplace_back(sys::CreatorFor<ServiceCellular>());
 #endif
 #endif
-
 #ifdef ENABLE_SERVICE_AUDIO
     systemServices.emplace_back(sys::CreatorFor<ServiceAudio>());
 #endif
 #ifdef ENABLE_SERVICE_BLUETOOTH
     systemServices.emplace_back(sys::CreatorFor<ServiceBluetooth>());
 #endif
-#ifdef ENABLE_SERVICE_DESKTOP
-    /// Due to the problem with USB MTP not supporting hierarchical folders structure, we cannot use
-    /// 'purefs::dir::getUserMediaPath()'. Instead, we can only pass a specific app folder which is very limiting.
-    /// Hopefully, support for hierarchical folders will be added in the future and such a case won't be relevant
-    /// anymore.
-    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>()));
 #endif


@@ 199,7 191,11 @@ int main()
         sys::CreatorFor<service::gui::ServiceGUI>(gui::Size{BOARD_EINK_DISPLAY_RES_X, BOARD_EINK_DISPLAY_RES_Y}));
 #endif
 #ifdef ENABLE_SERVICE_DESKTOP
-    systemServices.emplace_back(sys::CreatorFor<ServiceDesktop>());
+    /// Due to the problem with USB MTP not supporting hierarchical folders structure, we cannot use
+    /// 'purefs::dir::getUserMediaPath()'. Instead, we can only pass a specific app folder which is very limiting.
+    /// Hopefully, support for hierarchical folders will be added in the future and such a case won't be relevant
+    /// anymore.
+    systemServices.emplace_back(sys::CreatorFor<ServiceDesktop>(purefs::dir::getUserMediaPath() / "app/music_player"));
 #endif
 #if ENABLE_SERVICE_TEST
     systemServices.emplace_back(sys::CreatorFor<service::test::ServiceTest>());