Clean-up widget-dao, security-settings and bundle dependency

[Issue#]    N/A
[Problem]   Current wrt-setting has too many uncleaned source.
[Cause]     wrt-setting hasn't managed quite long-term since.
            Unnecessary dependency is existed.
[Solution]  Clean-up unnecessary build dependency
            - dpl-wrt-dao-ro, dpl-wrt-dao-rw, security-settings isn't necessary in the new UX.
              Only security-origin-dao is needed to implement new UX.
              To remove wrt-dao dependency, clean-up dao dependency code.
            - Clean-up getting application id by package id.
              Current security origin dao supports package id for input argument.
            - Replace bundle dependency to app_service.
              Current wrt-setting doesn't have any usecase regarding bundle API.
              Only app_service API is used to get package name from bundle_h.
              To use app_service API add dependency to "capi-appfw-application".
[SCMRequest] N/A

Change-Id: I637225c3047fc255cf4813ab568ca5ac603a1a52

diff --git a/packaging/wrt-setting.spec b/packaging/wrt-setting.spec
index c9a2855..a44a7ae 100755 (executable)
--- a/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@ -12,11 +12,9 @@ BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(ui-gadget-1)
-BuildRequires: pkgconfig(dpl-wrt-dao-ro)
-BuildRequires: pkgconfig(dpl-wrt-dao-rw)
 BuildRequires: pkgconfig(dpl-efl)
-BuildRequires: pkgconfig(security-settings)
 BuildRequires: pkgconfig(efl-assist)
+BuildRequires: pkgconfig(capi-appfw-application)
 
 %description
 WRT Setting UI Gadgets

diff --git a/webapp-detail/CMakeLists.txt b/webapp-detail/CMakeLists.txt
index d9d0e7c..82fa18e 100755 (executable)
--- a/webapp-detail/CMakeLists.txt
+++ b/webapp-detail/CMakeLists.txt
@@ -25,9 +25,6 @@ PKG_CHECK_MODULES(UG_WEB_APP_DETAIL_DEPS
     efl-assist
     ui-gadget-1
     dpl-efl
-    dpl-wrt-dao-rw
-    dpl-utils-efl
-    security-settings
     wrt-commons-security-origin-dao
     REQUIRED)
 

diff --git a/webapp-detail/exceptionsview.cpp b/webapp-detail/exceptionsview.cpp
index 3330a7b..1404f94 100755 (executable)
--- a/webapp-detail/exceptionsview.cpp
+++ b/webapp-detail/exceptionsview.cpp
@@ -60,14 +60,13 @@ const char* const TEXT_NAVIFRAME_TITLE = "Allow list";
 
 }
 
-ExceptionsView::ExceptionsView(Evas_Object* navi, DPL::String appID) :
+ExceptionsView::ExceptionsView(Evas_Object* navi, const std::string& pkgId) :
     m_naviframe(navi)
 {
-    WrtDB::WidgetDAOReadOnly dao(appID);
-    WrtDB::TizenPkgId pkgName = dao.getTizenPkgId();
     m_securityOriginDao =
         SecurityOriginDB::SecurityOriginDAOPtr(
-            new SecurityOriginDB::SecurityOriginDAO(pkgName));
+            new SecurityOriginDB::SecurityOriginDAO(
+                DPL::FromASCIIString(pkgId)));
 }
 
 ExceptionsView::~ExceptionsView(void)

diff --git a/webapp-detail/exceptionsview.h b/webapp-detail/exceptionsview.h
index 1091b18..2cdad0d 100755 (executable)
--- a/webapp-detail/exceptionsview.h
+++ b/webapp-detail/exceptionsview.h
@@ -34,7 +34,7 @@ namespace WebAppDetailSetting {
 class ExceptionsView
 {
   public:
-    ExceptionsView(Evas_Object *naviframe, DPL::String appID);
+    ExceptionsView(Evas_Object *naviframe, const std::string& pkgId);
     ~ExceptionsView(void);
 
     bool loadView(void);
@@ -45,7 +45,7 @@ class ExceptionsView
 
   private:
     Evas_Object *m_naviframe;
-    DPL::String m_appID;
+    DPL::String m_pkgId;
     SecurityOriginDB::SecurityOriginDAOPtr m_securityOriginDao;
 
     //Genlist

diff --git a/webapp-detail/mainview.cpp b/webapp-detail/mainview.cpp
index 1c04709..e64cab7 100755 (executable)
--- a/webapp-detail/mainview.cpp
+++ b/webapp-detail/mainview.cpp
@@ -48,7 +48,7 @@ Evas_Object *MainView::createContent(Evas_Object *parent)
     return NULL;
 
     try {
-    m_exception.Reset(new ExceptionsView(nf, m_appID));
+    m_exception.Reset(new ExceptionsView(nf, m_pkgId));
     if (!m_exception->loadView())
         goto del_list;
     return nf;
@@ -99,9 +99,9 @@ del_ly:
     return NULL;
 }
 
-MainView::MainView(ui_gadget_h ug, DPL::String appId) :
+MainView::MainView(ui_gadget_h ug, const std::string& pkgId) :
     m_ug(ug),
-    m_appID(appId)
+    m_pkgId(pkgId)
 {
     Assert(ug);
 

diff --git a/webapp-detail/mainview.h b/webapp-detail/mainview.h
index 06eb24c..8bd4b39 100755 (executable)
--- a/webapp-detail/mainview.h
+++ b/webapp-detail/mainview.h
@@ -28,7 +28,7 @@ namespace WebAppDetailSetting {
 class MainView
 {
     ui_gadget_h m_ug;
-    DPL::String m_appID;
+    std::string m_pkgId;
     DPL::ScopedPtr<ExceptionsView> m_exception;
 
     static void onBackBtnClicked(void *data,
@@ -38,7 +38,7 @@ class MainView
     Evas_Object *createContent(Evas_Object *parent);
 
   public:
-    MainView(ui_gadget_h ug, DPL::String appId);
+    MainView(ui_gadget_h ug, const std::string& pkgId);
     ~MainView(void);
 
     Evas_Object *loadView(void);

diff --git a/webapp-detail/ug.cpp b/webapp-detail/ug.cpp
index 90c69c6..dcf40b0 100755 (executable)
--- a/webapp-detail/ug.cpp
+++ b/webapp-detail/ug.cpp
@@ -19,12 +19,7 @@
 #include <ui-gadget-module.h>
 #include <string.h>
 #include <Elementary.h>
-#include <bundle.h>
-
-#undef None
-#include <dpl/wrt-dao-ro/WrtDatabase.h>
-#include <dpl/wrt-dao-ro/common_dao_types.h>
-#include <dpl/wrt-dao-ro/widget_dao_read_only.h>
+#include <app_service.h>
 
 #include "mainview.h"
 #include "util.h"
@@ -42,7 +37,6 @@ static void *onCreate(ui_gadget_h ug,
 {
     _D("called");
     struct priv *priv;
-    WrtDB::TizenAppId appID;
     char *pkgname = NULL;
 
     Assert(ug && user_data);
@@ -52,12 +46,10 @@ static void *onCreate(ui_gadget_h ug,
     if (!pkgname)
         return NULL;
 
-    appID = WrtDB::WidgetDAOReadOnly::getTzAppId((DPL::FromASCIIString
-                                                 (std::string(pkgname))));
-
     /* Create MainView */
     try {
-        priv->mainView = new WebAppDetailSetting::MainView(ug, appID);
+        priv->mainView =
+            new WebAppDetailSetting::MainView(ug, pkgname);
         return priv->mainView->loadView();
     } catch (const std::bad_alloc &) {
         return NULL;
@@ -87,9 +79,6 @@ EXPORT_SYMBOL int UG_MODULE_INIT(struct ug_module_ops *ops)
     if (!priv)
         return -1;
 
-    WrtDB::WrtDatabase::attachToThreadRW();
-    //AceDB::AceDAOReadOnly::attachToThreadRW();
-
     memset(ops, 0x00, sizeof(*ops));
     ops->priv = priv;
     ops->create = onCreate;
@@ -109,7 +98,4 @@ EXPORT_SYMBOL void UG_MODULE_EXIT(struct ug_module_ops *ops)
     if (priv->mainView)
         delete priv->mainView;
     free(priv);
-
-    //AceDB::AceDAOReadOnly::detachFromThread();
-    WrtDB::WrtDatabase::detachFromThread();
 }