Revert "Temporary fix for hybrid pkg installation"

This reverts commit da51f4c785b159887eef410c1057e30d66bb5ba4.

Now hybrid installer can merge manifest completely.

Submit with:
 - https://review.tizen.org/gerrit/107236
 - https://review.tizen.org/gerrit/107237
 - https://review.tizen.org/gerrit/107238
 - https://review.tizen.org/gerrit/107239

Change-Id: Ifb5f7d2810b5522686346a1766f1628e69cc3574
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>

diff --git a/src/tpk_manifest_handlers/common/application_handler.cc b/src/tpk_manifest_handlers/common/application_handler.cc
index 6baa9574a1f6e16eecfa5d729170c384e27a98f6..2d7963bad2ee2ae8125672c79eeea5cf49049812 100644 (file)
--- a/src/tpk_manifest_handlers/common/application_handler.cc
+++ b/src/tpk_manifest_handlers/common/application_handler.cc
@@ -61,12 +61,6 @@ const char kSplashScreenIndicatorDisplayKey[] = "@indicator-display";
 const char kSplashScreenAppControlOperationKey[] = "@app-control-operation";
 const char kSplashScreenColorDepthKey[] = "@color-depth";
 
-// FIXME: For hotfix, must be removed
-// support-size
-const char kSupportSizeKey[] = "support-size";
-const char kSupportSizePreviewKey[] = "@preview";
-const char kSupportSizeTextKey[] = "#text";
-
 }  // namespace tpk_app_keys
 
 }  // namespace parse

diff --git a/src/tpk_manifest_handlers/common/application_handler.h b/src/tpk_manifest_handlers/common/application_handler.h
index 96863d52105db54ee7dcb3e9ea071b171a7db4aa..230b24b261323c78d80347ca9c391f6c45095e3e 100644 (file)
--- a/src/tpk_manifest_handlers/common/application_handler.h
+++ b/src/tpk_manifest_handlers/common/application_handler.h
@@ -74,10 +74,6 @@ extern const char kSplashScreenIndicatorDisplayKey[];
 extern const char kSplashScreenOperationKey[];
 extern const char kSplashScreenAppControlOperationKey[];
 extern const char kSplashScreenColorDepthKey[];
-// FIXME: For hotfix, must be removed
-extern const char kSupportSizeKey[];
-extern const char kSupportSizePreviewKey[];
-extern const char kSupportSizeTextKey[];
 
 }  // namespace tpk_app_keys
 
@@ -121,8 +117,6 @@ struct ApplicationSingleEntry : public parser::ManifestData {
   std::vector<LabelInfo> label;
   std::vector<std::string> categories;
   ApplicationSplashScreenInfo app_splashscreens;
-  // FIXME: For hotfix, must be removed
-  std::vector<SupportSizeInfo> support_sizes;
 };
 
 template<typename T>

diff --git a/src/tpk_manifest_handlers/ui_and_service_application_infos.h b/src/tpk_manifest_handlers/ui_and_service_application_infos.h
index 6fb889def77bb8afdf110439cde6fd088704fe5d..d2ed29b5cbec2d4e2322662af41844d9d1fee8e8 100644 (file)
--- a/src/tpk_manifest_handlers/ui_and_service_application_infos.h
+++ b/src/tpk_manifest_handlers/ui_and_service_application_infos.h
@@ -226,25 +226,6 @@ class ApplicationIconsInfo : public parser::ManifestData {
   std::vector<ApplicationIcon> icons_;
 };
 
-// FIXME: For hotfix, must be removed
-class SupportSizeInfo : public parser::ManifestData {
- public:
-  SupportSizeInfo(const std::string& preview,
-                  const std::string& size)
-                  : preview_(preview),
-                    size_(size) {}
-
-  const std::string& preview() const {
-    return preview_;
-  }
-  const std::string& size() const {
-    return size_;
-  }
- private:
-  std::string preview_;
-  std::string size_;
-};
-
 class ApplicationImagesInfo {
  public:
   std::vector<ApplicationImage> images;

diff --git a/src/tpk_manifest_handlers/widget_application_handler.cc b/src/tpk_manifest_handlers/widget_application_handler.cc
index 4253a72bb7dd9e5abaae9cfac211bfc6794beca7..d4a193fce45d01e7814220138be10ec80147017b 100644 (file)
--- a/src/tpk_manifest_handlers/widget_application_handler.cc
+++ b/src/tpk_manifest_handlers/widget_application_handler.cc
@@ -62,18 +62,6 @@ bool ParseMetaData(const parser::DictionaryValue& dict,
   return true;
 }
 
-// FIXME: For hotfix, must be removed
-bool ParseSupportSize(const parser::DictionaryValue& dict,
-                        WidgetApplicationSingleEntry* info, std::string*) {
-  std::string preview;
-  dict.GetString(tpk_app_keys::kSupportSizePreviewKey, &preview);
-  std::string size;
-  dict.GetString(tpk_app_keys::kSupportSizeTextKey, &size);
-  info->support_sizes.emplace_back(preview, size);
-
-  return true;
-}
-
 bool InitializeParsing(const parser::DictionaryValue& app_dict,
                        WidgetApplicationSingleEntry* widgetapplicationinfo,
                        std::string* error) {
@@ -82,11 +70,6 @@ bool InitializeParsing(const parser::DictionaryValue& app_dict,
   if (!InitializeParsingElement(app_dict, tpk_app_keys::kMetaDataKey,
       parsingFunc, widgetapplicationinfo, error))
     return false;
-  // FIXME: For hotfox, must be removed
-  parsingFunc = ParseSupportSize;
-  if (!InitializeParsingElement(app_dict, tpk_app_keys::kSupportSizeKey,
-      parsingFunc, widgetapplicationinfo, error))
-    return false;
   parsingFunc = ParseAppIcon<WidgetApplicationSingleEntry>;
   if (!InitializeParsingElement(app_dict, tpk_app_keys::kIconKey,
       parsingFunc, widgetapplicationinfo, error))