WidgetHandle removal - part 4.

[Issue#] N/A
[Feature] Removes widget handle usage from FeatureLogic
[Cause] N/A
[Solution] N/A
[Verification] Install, reinstall, uninstall any widget with some features. Features should be listed in installation log.

Change-Id: I7511a12ac200f22b28cba19560b7d434a683e9c5

diff --git a/src/jobs/widget_install/task_ace_check.cpp b/src/jobs/widget_install/task_ace_check.cpp
index c1b0a98..7436f4b 100644 (file)
--- a/src/jobs/widget_install/task_ace_check.cpp
+++ b/src/jobs/widget_install/task_ace_check.cpp
@@ -51,9 +51,8 @@ TaskAceCheck::TaskAceCheck(InstallerContext& context) :
 
 void TaskAceCheck::StepPrepareForAce()
 {
-    WrtDB::WidgetDAO dao(m_context.locations->getPkgname());
     m_context.featureLogic =
-        FeatureLogicPtr(new FeatureLogic(dao.getHandle()));
+        FeatureLogicPtr(new FeatureLogic(m_context.locations->getPkgname()));
     m_context.job->UpdateProgress(
         InstallerContext::INSTALL_ACE_PREPARE,
         "Widget Access Control Check Prepared");
@@ -78,7 +77,7 @@ void TaskAceCheck::StepAceCheck()
     ace_policy_result_t policyResult = ACE_DENY;
     ace_return_t ret = ace_get_policy_result(
             const_cast<const ace_resource_t>(devCapStr.c_str()),
-            dao.getHandle(),
+            dao.getHandle(),                         //TODO: remove dao.getHandle()
             &policyResult);
     if (ACE_OK != ret) {
         ThrowMsg(Exceptions::NotAllowed, "Instalation failure. "
@@ -127,7 +126,7 @@ void TaskAceCheck::StepProcessAceResponse()
             list.items[i].smack_granted =
                     devCapsSmack[i] ? ACE_TRUE : ACE_FALSE;
         }
-        ace_return_t ret = ace_set_requested_dev_caps(dao.getHandle(),  //TODO: (ace_widget_handle_t not int needed)
+        ace_return_t ret = ace_set_requested_dev_caps(dao.getHandle(),   //TODO: remove dao.getHandle()
                                                       &list);
         if (ACE_OK != ret) {
             ThrowMsg(Exceptions::NotAllowed, "Instalation failure. "
@@ -154,7 +153,7 @@ void TaskAceCheck::StepProcessAceResponse()
             i++;
         }
 
-        ret = ace_set_accepted_feature(dao.getHandle(), &featureList);
+        ret = ace_set_accepted_feature(dao.getHandle(), &featureList); //TODO: remove dao.getHandle()
 
         delete [] featureList.items;
 

diff --git a/src/misc/feature_logic.cpp b/src/misc/feature_logic.cpp
index bef730f..ee71e76 100644 (file)
--- a/src/misc/feature_logic.cpp
+++ b/src/misc/feature_logic.cpp
@@ -29,10 +29,10 @@
 namespace Jobs {
 namespace WidgetInstall {
 
-FeatureLogic::FeatureLogic(WrtDB::DbWidgetHandle handle)
+FeatureLogic::FeatureLogic(const WrtDB::WidgetPkgName & pkgname)
   : m_rejected(false)
 {
-    WrtDB::WidgetDAOReadOnly widgetDao(handle);
+    WrtDB::WidgetDAOReadOnly widgetDao(pkgname);
     WidgetFeatureSet featureSet = widgetDao.getFeaturesList();
     FOREACH(it, featureSet) {
         LogInfo("Feature name : " << it->name);

diff --git a/src/misc/feature_logic.h b/src/misc/feature_logic.h
index da3731b..1c3ed23 100644 (file)
--- a/src/misc/feature_logic.h
+++ b/src/misc/feature_logic.h
@@ -33,7 +33,7 @@ namespace WidgetInstall {
 class FeatureLogic : DPL::Noncopyable {
   public:
 
-    FeatureLogic(WrtDB::DbWidgetHandle handle);
+    FeatureLogic(const WrtDB::WidgetPkgName & pkgname);
 
     bool isDone() const;