From a72a76e2cec7024986322ccb1f9d3250a55174d9 Mon Sep 17 00:00:00 2001 From: Soyoung Kim Date: Tue, 29 Jan 2013 21:59:47 +0900 Subject: [PATCH] Fixed widget name has special character. [Issue#] N/A [Problem] if widget name has special character, widget installation failed. [Cause] fail to check appid. [Solution] Fixed logic during widget installaion. [SCMRequest] N/A --- src/jobs/widget_install/job_widget_install.cpp | 2 +- src/jobs/widget_install/task_certificates.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jobs/widget_install/job_widget_install.cpp b/src/jobs/widget_install/job_widget_install.cpp index 8be2b6c..8bae8e3 100644 --- a/src/jobs/widget_install/job_widget_install.cpp +++ b/src/jobs/widget_install/job_widget_install.cpp @@ -85,7 +85,7 @@ const char * const CONFIG_XML = "config.xml"; const char * const WITH_OSP_XML = "res/wgt/config.xml"; //allowed: a-z, A-Z, 0-9 -const char* REG_TIZENID_PATTERN = "^[a-zA-Z0-9]{10}.[a-zA-Z0-9]{1,}$"; +const char* REG_TIZENID_PATTERN = "^[a-zA-Z0-9]{10}.{1,}$"; const size_t PACKAGE_ID_LENGTH = 10; static const DPL::String SETTING_VALUE_ENCRYPTION = L"encryption"; diff --git a/src/jobs/widget_install/task_certificates.cpp b/src/jobs/widget_install/task_certificates.cpp index 42fb092..14395d4 100755 --- a/src/jobs/widget_install/task_certificates.cpp +++ b/src/jobs/widget_install/task_certificates.cpp @@ -61,7 +61,7 @@ void TaskCertificates::StepSetCertiInfo() if ((pkgmgr_installer_save_certinfo( const_cast(DPL::ToUTF8String( - m_context.widgetConfig.tzAppid).c_str()), + m_context.widgetConfig.tzPkgid).c_str()), m_pkgHandle)) < 0) { LogError("pkgmgrInstallerSaveCertinfo fail"); ThrowMsg(Exceptions::SetCertificateInfoFailed, @@ -159,7 +159,7 @@ void TaskCertificates::StepAbortCertiInfo() { if ((pkgmgr_installer_delete_certinfo( const_cast(DPL::ToUTF8String( - m_context.widgetConfig.tzAppid).c_str()))) < 0) { + m_context.widgetConfig.tzPkgid).c_str()))) < 0) { LogError("pkgmgr_installer_delete_certinfo fail"); } } -- 2.7.4