From 6d9e6ed57ff2857c6ac4f156cd0ee491671593a1 Mon Sep 17 00:00:00 2001 From: Duyoung Jang Date: Sun, 7 Apr 2013 14:23:58 +0900 Subject: [PATCH] Fix livebox issue Change-Id: Ia1fd58262407da9c9316ae23b6e342d6a5049362 Signed-off-by: Duyoung Jang --- inc/InstallerDefs.h | 2 +- src/Context/InstallationContext.cpp | 20 -------------------- src/Context/InstallationContext.h | 4 ---- src/Context/InstallationContextData.cpp | 8 ++++++++ src/Context/InstallationContextData.h | 1 + src/XmlHandler/ManifestGenerator.cpp | 3 ++- src/XmlHandler/Parser/ManifestLiveboxesParser.cpp | 8 ++++---- src/XmlHandler/Parser/ManifestLiveboxesParser.h | 2 +- 8 files changed, 17 insertions(+), 31 deletions(-) diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h index 9d10dc0..d80e038 100755 --- a/inc/InstallerDefs.h +++ b/inc/InstallerDefs.h @@ -23,7 +23,7 @@ #include "InstallerUtil.h" -#define OSP_INSTALLER_VERSION "version=[20130405.2]" +#define OSP_INSTALLER_VERSION "version=[20130407.1]" #define DIR_BIN L"/bin" #define DIR_INFO L"/info" diff --git a/src/Context/InstallationContext.cpp b/src/Context/InstallationContext.cpp index 4f0a6b9..be2d8df 100755 --- a/src/Context/InstallationContext.cpp +++ b/src/Context/InstallationContext.cpp @@ -58,7 +58,6 @@ InstallationContext::InstallationContext(void) ,__pApp2ExtHandle(null) ,__pPrivilegeList(null) ,__pStringPrivilegeList(null) -,__pLiveboxDataList(null) ,__pContentDataList(null) ,__pAuthorCertPath(null) ,__pDistributorCertPath(null) @@ -96,13 +95,6 @@ InstallationContext::~InstallationContext(void) __pStringPrivilegeList = null; } - if (__pLiveboxDataList) - { - __pLiveboxDataList->RemoveAll(); - delete __pLiveboxDataList; - __pLiveboxDataList = null; - } - if (__pAppDataList) { __pAppDataList->RemoveAll(); @@ -316,18 +308,6 @@ InstallationContext::SetPrivilegeList(ArrayList* privilegeList) } ArrayList* -InstallationContext::GetLiveboxDataList(void) const -{ - return __pLiveboxDataList; -} - -void -InstallationContext::SetLiveboxDataList(ArrayList* pLiveboxDataList) -{ - __pLiveboxDataList = pLiveboxDataList; -} - -ArrayList* InstallationContext::GetContentDataList(void) const { return __pContentDataList; diff --git a/src/Context/InstallationContext.h b/src/Context/InstallationContext.h index bcf2281..cebd6f7 100755 --- a/src/Context/InstallationContext.h +++ b/src/Context/InstallationContext.h @@ -75,9 +75,6 @@ public: const Tizen::Base::Collection::ArrayList* GetPrivilegeList(void) const; void SetPrivilegeList(Tizen::Base::Collection::ArrayList* privilegeList); - Tizen::Base::Collection::ArrayList* GetLiveboxDataList(void) const; - void SetLiveboxDataList(Tizen::Base::Collection::ArrayList* pLiveboxDataList); - Tizen::Base::Collection::ArrayList* GetContentDataList(void) const; void SetContentDataList(Tizen::Base::Collection::ArrayList* pContentDataList); @@ -113,7 +110,6 @@ public: Tizen::Base::Collection::ArrayList* __pPrivilegeList; Tizen::Base::Collection::ArrayList* __pStringPrivilegeList; - Tizen::Base::Collection::ArrayList* __pLiveboxDataList; Tizen::Base::Collection::ArrayList* __pContentDataList; Tizen::Security::Cert::X509CertificatePath* __pAuthorCertPath; Tizen::Security::Cert::X509CertificatePath* __pDistributorCertPath; diff --git a/src/Context/InstallationContextData.cpp b/src/Context/InstallationContextData.cpp index 26d4819..39bcc89 100755 --- a/src/Context/InstallationContextData.cpp +++ b/src/Context/InstallationContextData.cpp @@ -434,6 +434,7 @@ AppData::AppData() ,__pAppControlImplList(null) ,__pDataControlList(null) ,__pSubModeAppControlDataList(null) +,__pLiveboxDataList(null) ,__pNameList(null) ,__pFeatureList(null) ,__pNotificationMap(null) @@ -485,6 +486,13 @@ AppData::~AppData() delete __pSubModeAppControlDataList; } + if (__pLiveboxDataList) + { + __pLiveboxDataList->RemoveAll(); + delete __pLiveboxDataList; + __pLiveboxDataList = null; + } + if (__pNameList) { __pNameList->RemoveAll(); diff --git a/src/Context/InstallationContextData.h b/src/Context/InstallationContextData.h index ec8fddc..15d5ff8 100755 --- a/src/Context/InstallationContextData.h +++ b/src/Context/InstallationContextData.h @@ -265,6 +265,7 @@ public: Tizen::Base::Collection::IListT<_AppControlInfo*>* __pAppControlImplList; Tizen::Base::Collection::IListT* __pDataControlList; Tizen::Base::Collection::IListT* __pSubModeAppControlDataList; + Tizen::Base::Collection::ArrayList* __pLiveboxDataList; Tizen::Base::Collection::HashMap* __pNameList; Tizen::Base::Collection::HashMap* __pFeatureList; diff --git a/src/XmlHandler/ManifestGenerator.cpp b/src/XmlHandler/ManifestGenerator.cpp index 1f6ba3c..42f99e9 100755 --- a/src/XmlHandler/ManifestGenerator.cpp +++ b/src/XmlHandler/ManifestGenerator.cpp @@ -213,8 +213,9 @@ ManifestGenerator::WriteLiveboxes(AppData* pAppData) const { TryReturn(__pContext, false, "__pContext is null."); TryReturn(__pWriter, false, "__pWriter is null."); + TryReturn(pAppData, false, "pAppData is null."); - ArrayList* pLiveboxDataList = __pContext->GetLiveboxDataList(); + ArrayList* pLiveboxDataList = pAppData->__pLiveboxDataList; String label("label"); if (pLiveboxDataList == null) diff --git a/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp b/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp index 519c3f6..c3a5f3c 100755 --- a/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp +++ b/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp @@ -36,7 +36,7 @@ using namespace Tizen::Io; using namespace Tizen::System; ManifestLiveboxesParser::ManifestLiveboxesParser(void) -:__pContext(null) +:__pAppData(null) ,__pLiveboxDataList(null) ,__pLiveboxData(null) { @@ -119,8 +119,8 @@ ManifestLiveboxesParser::OnLiveboxesStartElement() ManifestHandler* __pHandler = GetHandler(); TryReturn(__pHandler, false, "__pHandler is null"); - __pContext = __pHandler->GetContext(); - TryReturn(__pContext, false, "__pContext is null"); + __pAppData = __pHandler->GetAppData(); + TryReturn(__pAppData, false, "__pAppData is null."); __pLiveboxDataList = new (std::nothrow) ArrayList; TryReturn(__pLiveboxDataList, false, "__pLiveboxDataList is null"); @@ -195,7 +195,7 @@ ManifestLiveboxesParser::OnLiveboxStartElement(void) bool ManifestLiveboxesParser::OnLiveboxesEndElement(void) { - __pContext->SetLiveboxDataList(__pLiveboxDataList); + __pAppData->__pLiveboxDataList = __pLiveboxDataList; __pLiveboxDataList = null; AppLog(" "); diff --git a/src/XmlHandler/Parser/ManifestLiveboxesParser.h b/src/XmlHandler/Parser/ManifestLiveboxesParser.h index 6dee753..2c409a3 100755 --- a/src/XmlHandler/Parser/ManifestLiveboxesParser.h +++ b/src/XmlHandler/Parser/ManifestLiveboxesParser.h @@ -59,7 +59,7 @@ private: bool OnConfigurationAppControlAppIdValue(const char* pCharacters); private: - InstallationContext* __pContext; + AppData* __pAppData; Tizen::Base::Collection::ArrayList* __pLiveboxDataList; LiveboxData* __pLiveboxData; -- 2.7.4