From 35c8374fb9c935f69b3714f17080f945d4e93d28 Mon Sep 17 00:00:00 2001
From: Ilho Kim <ilho159.kim@samsung.com>
Date: Tue, 5 Jul 2022 21:37:53 +0900
Subject: [PATCH] Implement undo RemovePerUserStorageDirectories

If the uninstallation is failed after this step,
there is a problem that the user directory remains erased
so recreate the user directories removed by this step

Change-Id: Ib776b43fd7d9e313c1bb1d3251a9a89cce6e27f8
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
---
 src/hybrid/hybrid_installer.cc | 6 ++++--
 src/wgt/wgt_installer.cc       | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 4748781..9bc672d 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -240,7 +240,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<ci::pkgmgr::StepKillApps>();
       AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
       AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
-      AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>(
+          wgt::filesystem::HybridAdditionalSharedDirs);
       AddStep<ci::pkgmgr::StepUnregisterApplication>();
       AddStep<ci::filesystem::StepRemoveTep>();
       AddStep<ci::filesystem::StepRemoveFiles>();
@@ -608,7 +609,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
           ci::Plugin::ActionType::Uninstall);
       AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
       AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
-      AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>(
+          wgt::filesystem::HybridAdditionalSharedDirs);
       AddStep<ci::pkgmgr::StepUnregisterApplication>();
       AddStep<wgt::encryption::StepRemoveEncryptionData>();
       AddStep<ci::security::StepUnregisterTrustAnchor>();
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index bebc830..40a63f7 100755
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -319,7 +319,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Uninstall);
-      AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>(
+          wgt::filesystem::WgtAdditionalSharedDirs);
       AddStep<ci::pkgmgr::StepUnregisterApplication>();
       AddStep<ci::filesystem::StepRemoveTep>();
       AddStep<ci::filesystem::StepRemoveFiles>();
@@ -750,7 +751,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Uninstall);
-      AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
+      AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>(
+          wgt::filesystem::WgtAdditionalSharedDirs);
       AddStep<ci::pkgmgr::StepUnregisterApplication>();
       AddStep<wgt::encryption::StepRemoveEncryptionData>();
       AddStep<ci::security::StepUnregisterTrustAnchor>();
-- 
2.7.4