Osp-Installer merge changes from tizen_2.2

[platform/framework/native/installer.git] / src / Step / UninstallStep.cpp

diff --git a/src/Step/UninstallStep.cpp b/src/Step/UninstallStep.cpp
index 36d1993..a653d2a 100755 (executable)
--- a/src/Step/UninstallStep.cpp
+++ b/src/Step/UninstallStep.cpp
@@ -119,6 +119,8 @@ UninstallStep::GoNextState(void)
 InstallerError
 UninstallStep::OnStateGetPackageInfo(void)
 {
+       bool res = true;
+       result r = E_SUCCESS;
        InstallerError error = INSTALLER_ERROR_NONE;
        PackageId packageId = __pContext->__packageId;
 
@@ -127,7 +129,7 @@ UninstallStep::OnStateGetPackageInfo(void)
 
        AppLog("package = %ls", packageId.GetPointer());
 
-       result r = pPackageInfoImpl->Construct(packageId);
+       r = pPackageInfoImpl->Construct(packageId);
        TryReturn(r == E_SUCCESS, INSTALLER_ERROR_INTERNAL_STATE, "pPackageInfoImpl->Construct(%ls) failed.", packageId.GetPointer());
 
 //     bool isUninstallable = pPackageInfoImpl->IsUninstallable();
@@ -145,14 +147,10 @@ UninstallStep::OnStateGetPackageInfo(void)
                __pContext->__isPreloaded = true;
        }
 
-       __pContext->__rootPath = pPackageInfoImpl->GetAppRootPath();
+       //res = IsAvailableUninstall();
+       //TryReturn(res == true, INSTALLER_ERROR_DISABLED, "IsAvailableUninstall(%ls) failed.", packageId.GetPointer());
 
-       if (__pContext->__isHybridService == true)
-       {
-               AppLog("Uninstallation for HybridService");
-               __state = STATE_TERMINATE_APP;
-               return error;
-       }
+       __pContext->__rootPath = pPackageInfoImpl->GetAppRootPath();
 
        if (pPackageInfoImpl->IsInstalledInExternalStorage() == true)
        {
@@ -212,7 +210,7 @@ UninstallStep::OnStateTerminateApp(void)
 {
        InstallerError error = INSTALLER_ERROR_NONE;
 
-       InstallerUtil::TerminateApps(__pContext->__packageId);
+       InstallerUtil::TerminateApps(__pContext->__packageId, true);
 
        GoNextState();
        return error;
@@ -271,25 +269,18 @@ UninstallStep::OnStateRemoveDir(void)
 
        AppLog("Directory::Remove - START");
 
-       if (__pContext->__isHybridService == true)
+       String realPath;
+       if (InstallerUtil::IsSymlink(rootPath) == true)
        {
-               AppLog("Uninstallation for HybridService - skip Remove");
-
-       }
-       else
-       {
-               String realPath;
-               if (InstallerUtil::IsSymlink(rootPath) == true)
+               if (InstallerUtil::GetRealPath(rootPath, realPath) == true)
                {
-                       if (InstallerUtil::GetRealPath(rootPath, realPath) == true)
-                       {
-                               InstallerUtil::Remove(realPath);
-                       }
+                       InstallerUtil::Remove(realPath);
                }
-
-               InstallerUtil::Remove(rootPath);
        }
 
+       InstallerUtil::Remove(rootPath);
+
+
        IListT<AppData*>* pAppDataList = __pContext->__pAppDataList;
        TryReturn(pAppDataList, INSTALLER_ERROR_INTERNAL_STATE, "pAppDataList is null");