Revert "Revert "Removing proceeding account and shortcut data""

This reverts commit 5c7bc9b9d0ffa17241856ed7728fe2f086066a16.

Change-Id: I31b45f8c4124bc8fb75c552574356e1f9ab7b709

diff --git a/src/common/step/configuration/step_parse_manifest.cc b/src/common/step/configuration/step_parse_manifest.cc
index 65b67f1..cc07e91 100644 (file)
--- 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 (file)
--- 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);