Chaning the ID to TizenAppID from PkgID

[Issue#] N/A
[Problem] Web App Setting UG creation fail
[Cause] Setting UG use wrong ID (PkgID)
[Solution] Setting UG use TizenID
[SCMRequest] N/A

Change-Id: Idefc7fe93b1eb0f59f3fd92f107482284e208c81

diff --git a/packaging/wrt-setting.spec b/packaging/wrt-setting.spec
index 32d924e..355f1b6 100644 (file)
--- a/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@ -1,5 +1,5 @@
 Name: wrt-setting
-Version: 0.0.28
+Version: 1.0.28
 Release: 1
 Summary: WRT Setting UI Gadgets
 Group:   Development/Libraries

diff --git a/webapp-detail/advancedview.cpp b/webapp-detail/advancedview.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 2108e01..2831372
--- a/webapp-detail/advancedview.cpp
+++ b/webapp-detail/advancedview.cpp
@@ -43,7 +43,7 @@ const char* const ELM_GENLIST_ITEM_CLASS_STYLE_1TEXT_1ICON_6 = "1text.1icon.6";
 const char* const TEXT_NAVIFRAME_TITLE = "Advanced Settings";
 }
 
-AdvancedView::AdvancedView(Evas_Object *navi, int appID) :
+AdvancedView::AdvancedView(Evas_Object *navi, DPL::String appID) :
     m_naviframe(navi),
     m_appID(appID)
 {
@@ -307,7 +307,7 @@ void AdvancedView::loadDeveloperOptionsMenu(Evas_Object* genlist)
     }
 }
 
-SettingData::SettingData(int appID, int index, std::string menuText) :
+SettingData::SettingData(DPL::String appID, int index, std::string menuText) :
     m_index(static_cast<MenuIndex>(index)),
     m_menuText(menuText)
 {

diff --git a/webapp-detail/advancedview.h b/webapp-detail/advancedview.h
old mode 100644 (file)
new mode 100755 (executable)
index 4099084..3bfa2bd
--- a/webapp-detail/advancedview.h
+++ b/webapp-detail/advancedview.h
@@ -23,6 +23,7 @@
 #include <string>
 #include <map>
 #include <dpl/scoped_ptr.h>
+#include <dpl/string.h>
 
 #include "view.h"
 
@@ -58,7 +59,7 @@ enum MenuIndex {
 class AdvancedView : public View
 {
   public:
-    AdvancedView(Evas_Object *naviframe, int appID);
+    AdvancedView(Evas_Object *naviframe, DPL::String appID);
     ~AdvancedView(void);
 
     bool loadView(void);
@@ -67,7 +68,7 @@ class AdvancedView : public View
 
   private:
     Evas_Object *m_naviframe;
-    int m_appID;
+    DPL::String m_appID;
     DPL::ScopedPtr<ExceptionsView> m_exceptionsView;
     std::map<int, std::string> m_groupMenuMap;
     std::map<int, std::string> m_menuMap;
@@ -127,7 +128,7 @@ class SettingData
     std::string m_menuText;
     std::string m_iconPart;
 
-    SettingData(int appID, int index, std::string menuText);
+    SettingData(DPL::String appID, int index, std::string menuText);
     bool isEnabled();
     void saveChange(bool state);
 };

diff --git a/webapp-detail/detailview.cpp b/webapp-detail/detailview.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 266101c..1727733
--- a/webapp-detail/detailview.cpp
+++ b/webapp-detail/detailview.cpp
@@ -1017,7 +1017,7 @@ bool DetailView::pushToNaviFrame(void)
     return true;
 }
 
-DetailView::DetailView(Evas_Object* navi, ui_gadget_h ug, int appID) :
+DetailView::DetailView(Evas_Object* navi, ui_gadget_h ug, DPL::String appID) :
     m_naviframe(navi),
     m_bx(NULL),
     m_appID(appID),

diff --git a/webapp-detail/detailview.h b/webapp-detail/detailview.h
index 0268fc4..368cdca 100755 (executable)
--- a/webapp-detail/detailview.h
+++ b/webapp-detail/detailview.h
@@ -53,7 +53,7 @@ class DetailView : public View
     ui_gadget_h m_ug;
     DPL::ScopedPtr<WrtDB::WidgetDAO> m_dao;
     WrtDB::WidgetLocalizedInfo m_localizedInfo;
-    int m_appID;
+    DPL::String m_appID;
     LicenseInfo *m_licenseInfo;
     DPL::ScopedPtr<AdvancedView> m_advancedView;
 
@@ -131,7 +131,7 @@ class DetailView : public View
                                     void *event_info);
     bool pushToNaviFrame(void);
   public:
-    DetailView(Evas_Object* naviframe, ui_gadget_h ug, int appID);
+    DetailView(Evas_Object* naviframe, ui_gadget_h ug, DPL::String appID);
     ~DetailView(void);
 
     Evas_Object *loadView(void);

diff --git a/webapp-detail/exceptionsview.cpp b/webapp-detail/exceptionsview.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 867bc05..7108666
--- a/webapp-detail/exceptionsview.cpp
+++ b/webapp-detail/exceptionsview.cpp
@@ -59,7 +59,7 @@ const char* const TEXT_NAVIFRAME_TITLE = "Exceptions Settings";
 
 }
 
-ExceptionsView::ExceptionsView(Evas_Object* navi, int appID) :
+ExceptionsView::ExceptionsView(Evas_Object* navi, DPL::String appID) :
     m_naviframe(navi)
 {
     m_securityOriginDao =

diff --git a/webapp-detail/exceptionsview.h b/webapp-detail/exceptionsview.h
old mode 100644 (file)
new mode 100755 (executable)
index 042bd19..6490364
--- a/webapp-detail/exceptionsview.h
+++ b/webapp-detail/exceptionsview.h
@@ -36,7 +36,7 @@ namespace WebAppDetailSetting {
 class ExceptionsView : public View
 {
   public:
-    ExceptionsView(Evas_Object *naviframe, int appID);
+    ExceptionsView(Evas_Object *naviframe, DPL::String appID);
     ~ExceptionsView(void);
 
     bool loadView(void);
@@ -47,7 +47,7 @@ class ExceptionsView : public View
 
   private:
     Evas_Object *m_naviframe;
-    int m_appID;
+    DPL::String m_appID;
     SecurityOriginDB::SecurityOriginDAOPtr m_securityOriginDao;
 
     //Genlist

diff --git a/webapp-detail/mainview.cpp b/webapp-detail/mainview.cpp
index 640debc..6eee607 100755 (executable)
--- a/webapp-detail/mainview.cpp
+++ b/webapp-detail/mainview.cpp
@@ -157,7 +157,7 @@ del_ly:
     return NULL;
 }
 
-MainView::MainView(ui_gadget_h ug, int appId) :
+MainView::MainView(ui_gadget_h ug, DPL::String appId) :
     m_ug(ug),
     m_appID(appId),
     m_subCtnt(NULL),

diff --git a/webapp-detail/mainview.h b/webapp-detail/mainview.h
old mode 100644 (file)
new mode 100755 (executable)
index 1063c10..d601f78
--- a/webapp-detail/mainview.h
+++ b/webapp-detail/mainview.h
@@ -30,7 +30,7 @@ namespace WebAppDetailSetting {
 class MainView : public View
 {
     ui_gadget_h m_ug;
-    int m_appID;
+    DPL::String m_appID;
     Evas_Object *m_subCtnt;
     DPL::ScopedPtr<DetailView> m_detail;
     DPL::ScopedPtr<PermView> m_perm;
@@ -48,7 +48,7 @@ class MainView : public View
     Evas_Object *createToolBar(Evas_Object *parent);
 
   public:
-    MainView(ui_gadget_h ug, int appId);
+    MainView(ui_gadget_h ug, DPL::String appId);
     ~MainView(void);
 
     Evas_Object *loadView(void);

diff --git a/webapp-detail/ug.cpp b/webapp-detail/ug.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 3ad9cea..44d12dd
--- a/webapp-detail/ug.cpp
+++ b/webapp-detail/ug.cpp
@@ -23,6 +23,7 @@
 
 #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 "mainview.h"
@@ -39,7 +40,7 @@ static void *onCreate(ui_gadget_h ug,
                       void *user_data)
 {
     struct priv *priv;
-    int appID;
+    WrtDB::TizenAppId appID;
     char *pkgname = NULL;
 
     Assert(ug && user_data);
@@ -49,9 +50,8 @@ static void *onCreate(ui_gadget_h ug,
     if (!pkgname)
         return NULL;
 
-    appID = static_cast<int>
-        (WrtDB::WidgetDAOReadOnly::getHandle(DPL::FromASCIIString
-                                             (std::string(pkgname))));
+    appID = WrtDB::WidgetDAOReadOnly::getTzAppId((DPL::FromASCIIString
+                                                 (std::string(pkgname))));
 
     /* Create MainView */
     try {