From: Tomasz Iwanek <t.iwanek@samsung.com>
Date: Fri, 26 Feb 2016 15:27:59 +0000 (+0100)
Subject: Removing proceeding account and shortcut data
X-Git-Tag: accepted/tizen/common/20160401.171314~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e24a6eddd0e7ca2bb957d2e2de3d6e0315f5846;p=platform%2Fcore%2Fappfw%2Fapp-installers.git

Removing proceeding account and shortcut data

This data is parsed by plugins in case of tpk and we don't
need to store this information anywhere. Information that
was set by those methods wasn't read anywhere.

There is a different situation in case of wgt backend where
we generate platform xml manifest and we need this information.
Otherwise it may be lost when update is running.

Change-Id: I73a073e0ff252b9cef7445143965d708d7a2c5d4
---

diff --git a/src/common/step/configuration/step_parse_manifest.cc b/src/common/step/configuration/step_parse_manifest.cc
index 65b67f1..cc07e91 100644
--- a/src/common/step/configuration/step_parse_manifest.cc
+++ b/src/common/step/configuration/step_parse_manifest.cc
@@ -696,50 +696,6 @@ bool StepParseManifest::FillImage(application_x* app,
   return true;
 }
 
-bool StepParseManifest::FillAccounts() {
-  std::shared_ptr<const tpk::parse::AccountInfo> account_info =
-      std::static_pointer_cast<const tpk::parse::AccountInfo>(
-        parser_->GetManifestData(app_keys::kAccountKey));
-  if (!account_info)
-    return true;
-
-  AccountInfo info;
-  for (auto& account : account_info->accounts()) {
-    SingleAccountInfo single_info;
-    single_info.capabilities = account.capabilities;
-    single_info.icon_paths = account.icon_paths;
-    single_info.multiple_account_support = account.multiple_account_support;
-    single_info.names = account.labels;
-    // appid has the same value as package
-    single_info.appid =  account.app_id;
-    single_info.providerid = account.provider_id;
-    info.set_account(single_info);
-  }
-  context_->manifest_plugins_data.get().account_info.set(info);
-  return true;
-}
-
-bool StepParseManifest::FillShortcuts() {
-  std::shared_ptr<const tpk::parse::ShortcutListInfo> shortcut_info =
-      std::static_pointer_cast<const tpk::parse::ShortcutListInfo>(
-        parser_->GetManifestData(app_keys::kShortcutListKey));
-  if (!shortcut_info)
-    return true;
-
-  ShortcutListInfo list;
-  for (auto& shortcut : shortcut_info->shortcuts) {
-    ShortcutInfo single_info;
-    single_info.app_id = shortcut.app_id;
-    single_info.extra_data = shortcut.extra_data;
-    single_info.extra_key = shortcut.extra_key;
-    single_info.icon = shortcut.icon;
-    single_info.labels =  shortcut.labels;
-    list.push_back(single_info);
-  }
-  context_->manifest_plugins_data.get().shortcut_info.set(list);
-  return true;
-}
-
 template <typename T>
 bool StepParseManifest::FillBackgroundCategoryInfo(application_x* app,
     const T& background_category_data_list) {
@@ -770,10 +726,6 @@ bool StepParseManifest::FillManifestX(manifest_x* manifest) {
     return false;
   if (!FillDescriptionInfo(manifest))
     return false;
-  if (!FillAccounts())
-    return false;
-  if (!FillShortcuts())
-    return false;
   return true;
 }
 
diff --git a/src/common/step/configuration/step_parse_manifest.h b/src/common/step/configuration/step_parse_manifest.h
index b2aa32c..be509a3 100644
--- a/src/common/step/configuration/step_parse_manifest.h
+++ b/src/common/step/configuration/step_parse_manifest.h
@@ -86,8 +86,6 @@ class StepParseManifest : public common_installer::Step {
       bool FillCategories(application_x* manifest, const T& meta_data_list);
   bool FillImage(application_x* app,
                  const tpk::parse::ApplicationImagesInfo& label_list);
-  bool FillAccounts();
-  bool FillShortcuts();
   template <typename T>
   bool FillBackgroundCategoryInfo(application_x* app,
       const T& background_category_data_list);