1 files changed, 3 insertions, 9 deletions
diff --git a/src/jobs/widget_install/task_encrypt_resource.cpp b/src/jobs/widget_install/task_encrypt_resource.cpp
index 6414eb7..91cef03 100644
--- a/src/jobs/widget_install/task_encrypt_resource.cpp
+++ b/src/jobs/widget_install/task_encrypt_resource.cpp
@@ -77,13 +77,7 @@ void TaskEncryptResource::StepEncryptResource()
     m_resEnc->CreateEncryptionKey(DPL::ToUTF8String(*m_context.
                 widgetConfig.pkgname));
 
-    if (m_context.widgetConfig.pType == PKG_TYPE_TIZEN_WITHSVCAPP) {
-        tempInstalledPath = m_context.tempWidgetPath;
-    } else {
-        tempInstalledPath = m_context.tempWidgetRoot;
-    }
-
-    EncryptDirectory(tempInstalledPath);
+    EncryptDirectory(m_context.locations->getTemporaryRootDir());
 }
 
 void TaskEncryptResource::EncryptDirectory(std::string path)
@@ -173,8 +167,8 @@ void TaskEncryptResource::EncryptFile(const std::string &fileName)
             }
 
             std::string realPath = fileName;
-            realPath.replace(0, tempInstalledPath.length(),
-                    m_context.installPath);
+            realPath.replace(0, m_context.locations->getTemporaryRootDir().length(),
+                    m_context.locations->getPackageInstallationDir());
 
             WrtDB::EncryptedFileInfo info;
             info.fileName = DPL::FromUTF8String(realPath);