From da4c4d58e52f8df826f5643fdeed5e07161b5da9 Mon Sep 17 00:00:00 2001
From: jongmyeongko <jongmyeong.ko@samsung.com>
Date: Tue, 22 Nov 2016 16:43:12 +0900
Subject: [PATCH] apply extended concept of package's attribute.

Requires :
	https://review.tizen.org/gerrit/#/c/99039/

Change-Id: I3da722ec30cd00554b9fe9e00b001bb6922a8cbf
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>
---
 src/hybrid/hybrid_installer.cc                         | 1 +
 src/wgt/step/configuration/step_parse.cc               | 4 ----
 src/wgt/step/encryption/step_encrypt_resources.cc      | 2 +-
 src/wgt/step/encryption/step_remove_encryption_data.cc | 2 +-
 src/wgt/step/pkgmgr/step_generate_xml.cc               | 2 +-
 src/wgt/wgt_installer.cc                               | 2 ++
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 2b416e3..324c771 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -236,6 +236,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::configuration::StepParse>(
           wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
       AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<ci::configuration::StepParsePreload>();
       AddStep<ci::configuration::StepCheckTizenVersion>();
       AddStep<ci::security::StepCheckSignature>();
       AddStep<ci::security::StepPrivilegeCompatibility>(
diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc
index cf349e8..8fcbcec 100644
--- a/src/wgt/step/configuration/step_parse.cc
+++ b/src/wgt/step/configuration/step_parse.cc
@@ -230,10 +230,6 @@ bool StepParse::FillWidgetInfo(manifest_x* manifest) {
   manifest->type = strdup("wgt");
   manifest->appsetting = strdup("false");
   manifest->nodisplay_setting = strdup("false");
-  if (context_->is_preload_request.get())
-    manifest->preload = strdup("true");
-  else
-    manifest->preload = strdup("false");
   manifest->installed_storage = strdup("installed_internal");
 
   // For wgt package use the long name
diff --git a/src/wgt/step/encryption/step_encrypt_resources.cc b/src/wgt/step/encryption/step_encrypt_resources.cc
index d7d2e9a..9c6b9d8 100644
--- a/src/wgt/step/encryption/step_encrypt_resources.cc
+++ b/src/wgt/step/encryption/step_encrypt_resources.cc
@@ -195,7 +195,7 @@ bool StepEncryptResources::EncryptFile(const bf::path &src) {
               == common_installer::RequestMode::GLOBAL) {
         ret = wae_encrypt_global_web_application(
                 context_->pkgid.get().c_str(),
-                context_->is_preload_request.get() ?
+                context_->is_readonly_package.get() ?
                 true : false,
                 inChunk.get(),
                 (size_t)bytesRead,
diff --git a/src/wgt/step/encryption/step_remove_encryption_data.cc b/src/wgt/step/encryption/step_remove_encryption_data.cc
index e398b23..7b3e9ac 100644
--- a/src/wgt/step/encryption/step_remove_encryption_data.cc
+++ b/src/wgt/step/encryption/step_remove_encryption_data.cc
@@ -18,7 +18,7 @@ common_installer::Step::Status StepRemoveEncryptionData::process() {
   int ret;
   if (context_->request_mode.get() == common_installer::RequestMode::GLOBAL)
     ret = wae_remove_global_app_dek(context_->pkgid.get().c_str(),
-                context_->is_preload_request.get() ?
+                context_->is_readonly_package.get() ?
                 true : false);
   else
     ret = wae_remove_app_dek(context_->uid.get(),
diff --git a/src/wgt/step/pkgmgr/step_generate_xml.cc b/src/wgt/step/pkgmgr/step_generate_xml.cc
index 3e63560..d1d1e6f 100644
--- a/src/wgt/step/pkgmgr/step_generate_xml.cc
+++ b/src/wgt/step/pkgmgr/step_generate_xml.cc
@@ -341,7 +341,7 @@ common_installer::Step::Status StepGenerateXml::precheck() {
 common_installer::Step::Status StepGenerateXml::process() {
   bf::path xml_path =
       bf::path(getUserManifestPath(context_->uid.get(),
-                  context_->is_preload_request.get()))
+                  context_->is_readonly_package.get()))
       / bf::path(context_->pkgid.get());
   xml_path += ".xml";
   context_->xml_path.set(xml_path.string());
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 43fc80c..e87ec01 100755
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -222,6 +222,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<wgt::configuration::StepCheckRDSManifest>();
       AddStep<wgt::configuration::StepParse>(
           wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, false);
+      AddStep<ci::configuration::StepParsePreload>();
       AddStep<ci::pkgmgr::StepCheckRestriction>();
       AddStep<ci::configuration::StepCheckTizenVersion>();
       AddStep<ci::pkgmgr::StepKillApps>();
@@ -247,6 +248,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
           ci::configuration::StepParseManifest::StoreLocation::BACKUP);
+      AddStep<ci::configuration::StepParsePreload>();
       AddStep<ci::configuration::StepCheckTizenVersion>();
       AddStep<ci::filesystem::StepEnableExternalMount>();
       AddStep<ci::filesystem::StepDeltaPatch>("res/wgt/");
-- 
2.7.4