Add StepRemovePerUserStorageDirectories to uninstall step

Change-Id: If257ec6319f69c04e7fe6c6f6610d300398eb822

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 7f875b3..8a7f0c9 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -33,6 +33,7 @@
 #include <common/step/step_recover_security.h>
 #include <common/step/step_recover_storage_directories.h>
 #include <common/step/step_remove_temporary_directory.h>
+#include <common/step/step_remove_per_user_storage_directories.h>
 #include <common/step/step_rollback_deinstallation_security.h>
 #include <common/step/step_rollback_installation_security.h>
 #include <common/step/step_run_parser_plugins.h>
@@ -141,6 +142,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::PluginsLauncher::ActionType::Uninstall);
       AddStep<ci::pkgmgr::StepKillApps>();
+      AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
       AddStep<ci::pkgmgr::StepUnregisterApplication>();
       AddStep<ci::security::StepRollbackDeinstallationSecurity>();
       AddStep<ci::filesystem::StepRemoveFiles>();

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 4d3d84a..1135fac 100644 (file)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -32,6 +32,7 @@
 #include <common/step/step_remove_icons.h>
 #include <common/step/step_remove_files.h>
 #include <common/step/step_remove_temporary_directory.h>
+#include <common/step/step_remove_per_user_storage_directories.h>
 #include <common/step/step_revoke_security.h>
 #include <common/step/step_register_security.h>
 #include <common/step/step_rollback_deinstallation_security.h>
@@ -135,6 +136,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::pkgmgr::StepKillApps>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::PluginsLauncher::ActionType::Uninstall);
+      AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
+
       AddStep<ci::pkgmgr::StepUnregisterApplication>();
       AddStep<ci::security::StepRollbackDeinstallationSecurity>();
       AddStep<ci::filesystem::StepRemoveFiles>();