#include <manifest_parser/utils/version_number.h>
#include <wgt_manifest_handlers/account_handler.h>
#include <wgt_manifest_handlers/app_control_handler.h>
+#include <wgt_manifest_handlers/appdefined_privilege_handler.h>
#include <wgt_manifest_handlers/application_icons_handler.h>
#include <wgt_manifest_handlers/application_manifest_constants.h>
#include <wgt_manifest_handlers/background_category_handler.h>
#include <wgt_manifest_handlers/content_handler.h>
#include <wgt_manifest_handlers/ime_handler.h>
#include <wgt_manifest_handlers/metadata_handler.h>
-#include <wgt_manifest_handlers/provides_appdefined_privileges_handler.h>
+#include <wgt_manifest_handlers/provides_appdefined_privilege_handler.h>
#include <wgt_manifest_handlers/service_handler.h>
#include <wgt_manifest_handlers/setting_handler.h>
#include <wgt_manifest_handlers/tizen_application_handler.h>
}
bool StepParse::FillAppDefinedPrivileges(manifest_x* manifest) {
- auto priv_info =
- GetManifestDataForKey<const wgt::parse::AppDefinedPrivilegeInfo>(
+ auto priv_info_list =
+ GetManifestDataForKey<const wgt::parse::AppDefinedPrivilegeInfoList>(
app_keys::kTizenAppDefinedPrivilegeKey);
- if (!priv_info)
+ if (!priv_info_list)
return true;
- const auto& privileges = priv_info->GetAppDefinedPrivilegeList();
- for (auto& priv : privileges) {
+ for (auto& priv : priv_info_list->appdefined_privileges) {
appdefined_privilege_x* privilege =
reinterpret_cast<appdefined_privilege_x*>(calloc(1,
sizeof(appdefined_privilege_x)));
LOG(ERROR) << "Memory alloc failure";
return false;
}
- privilege->value = strdup(priv.privilege.c_str());
+ privilege->value = strdup(priv.name().c_str());
privilege->type = strdup(common_installer::kWebPrivilegeType);
- if (!priv.license.empty()) {
- if (bf::path(priv.license).is_absolute())
- privilege->license = strdup(priv.license.c_str());
+ if (!priv.license().empty()) {
+ if (bf::path(priv.license()).is_absolute())
+ privilege->license = strdup(priv.license().c_str());
else
privilege->license = strdup((context_->root_application_path.get()
- / manifest->package / priv.license).c_str());
+ / manifest->package / priv.license()).c_str());
}
manifest->appdefined_privileges =
g_list_append(manifest->appdefined_privileges, privilege);
}
bool StepParse::FillProvidesAppDefinedPrivileges(manifest_x* manifest) {
- auto priv_info =
- GetManifestDataForKey<const wgt::parse::AppDefinedPrivilegeInfo>(
- app_keys::kTizenProvidesAppDefinedPrivilegesKey);
- if (!priv_info)
+ auto priv_info_list =
+ GetManifestDataForKey<const wgt::parse::AppDefinedPrivilegeInfoList>(
+ app_keys::kTizenProvidesAppDefinedPrivilegeKey);
+ if (!priv_info_list)
return true;
- const auto& privileges = priv_info->GetAppDefinedPrivilegeList();
- for (auto& priv : privileges) {
+ for (auto& priv : priv_info_list->appdefined_privileges) {
appdefined_privilege_x* privilege =
reinterpret_cast<appdefined_privilege_x*>(calloc(1,
sizeof(appdefined_privilege_x)));
LOG(ERROR) << "Memory alloc failure";
return false;
}
- privilege->value = strdup(priv.privilege.c_str());
+ privilege->value = strdup(priv.name().c_str());
privilege->type = strdup(common_installer::kWebPrivilegeType);
- if (!priv.license.empty()) {
- if (bf::path(priv.license).is_absolute())
- privilege->license = strdup(priv.license.c_str());
+ if (!priv.license().empty()) {
+ if (bf::path(priv.license()).is_absolute())
+ privilege->license = strdup(priv.license().c_str());
else
privilege->license = strdup((context_->root_application_path.get()
- / manifest->package / priv.license).c_str());
+ / manifest->package / priv.license()).c_str());
}
manifest->provides_appdefined_privileges =
g_list_append(manifest->provides_appdefined_privileges, privilege);