Revert "Change pkgname to appid for docomo request. PART2"

This reverts commit 7be470a31cafd8b37b23be3aafa2783944cefc56.

Change-Id: Ib61e026a018a54fe57117e1d50fd6eec3dede118

diff --git a/src/jobs/widget_install/job_widget_install.cpp b/src/jobs/widget_install/job_widget_install.cpp
index 4ba7390..9e56959 100644 (file)
--- a/src/jobs/widget_install/job_widget_install.cpp
+++ b/src/jobs/widget_install/job_widget_install.cpp
@@ -414,12 +414,10 @@ void JobWidgetInstall::configureWidgetLocation(const std::string & widgetPath,
                                                const std::string& tempPath)
 {
     m_installerContext.locations =
-        WidgetLocation(DPL::ToUTF8String(m_installerContext.widgetConfig.tzPkgid),
+        WidgetLocation(DPL::ToUTF8String(m_installerContext.widgetConfig.tzAppid),
                 widgetPath, tempPath,
                 m_installerContext.widgetConfig.packagingType,
                 m_installerContext.locationType);
-    m_installerContext.locations->registerAppid(
-            DPL::ToUTF8String(m_installerContext.widgetConfig.tzAppid));
 
     LogInfo("widgetSource " << widgetPath);
 }

diff --git a/src/jobs/widget_uninstall/job_widget_uninstall.cpp b/src/jobs/widget_uninstall/job_widget_uninstall.cpp
index 6cf8009..b080652 100644 (file)
--- a/src/jobs/widget_uninstall/job_widget_uninstall.cpp
+++ b/src/jobs/widget_uninstall/job_widget_uninstall.cpp
@@ -73,11 +73,10 @@ JobWidgetUninstall::JobWidgetUninstall(const std::string & tizenAppId,
     Try
     {
         WrtDB::WidgetDAOReadOnly dao(DPL::FromUTF8String(tizenAppId));
+        m_context.locations = WidgetLocation(m_context.tzAppid);
         m_context.tzPkgid = DPL::ToUTF8String(dao.getTizenPkgId());
-        m_context.locations = WidgetLocation(m_context.tzPkgid);
-        m_context.locations->registerAppid(m_context.tzAppid);
 
-        LogInfo("Widget model exists. App id : " << m_context.tzAppid);
+        LogInfo("Widget model exists. Pkg name: " << m_context.tzAppid);
 
         AddTask(new TaskSmack(m_context));
         AddTask(new TaskCheck(m_context));

diff --git a/src/misc/widget_location.cpp b/src/misc/widget_location.cpp
index e4bd94e..e78f0e1 100644 (file)
--- a/src/misc/widget_location.cpp
+++ b/src/misc/widget_location.cpp
@@ -124,7 +124,7 @@ std::string WidgetLocation::getBinaryDir() const
 
 std::string WidgetLocation::getExecFile() const
 {
-    return getBinaryDir() + "/" + m_appid;
+    return getBinaryDir() + "/" + m_pkgid;
 }
 
 std::string WidgetLocation::getBackupDir() const
@@ -144,7 +144,7 @@ std::string WidgetLocation::getBackupBinaryDir() const
 
 std::string WidgetLocation::getBackupExecFile() const
 {
-    return getBackupBinaryDir() + "/" + m_appid;
+    return getBackupBinaryDir() + "/" + m_pkgid;
 }
 
 std::string WidgetLocation::getUserDataRootDir() const
@@ -235,8 +235,3 @@ WrtDB::ExternalLocationList WidgetLocation::listExternalLocations() const
 {
     return m_externals;
 }
-
-void WidgetLocation::registerAppid(const std::string & appid)
-{
-    m_appid = appid;
-}

diff --git a/src/misc/widget_location.h b/src/misc/widget_location.h
index db024b3..3a9c152 100644 (file)
--- a/src/misc/widget_location.h
+++ b/src/misc/widget_location.h
@@ -188,14 +188,8 @@ public:
      */
     WrtDB::ExternalLocationList listExternalLocations() const;
 
-    /*
-     * @brief set appid
-     */
-    void registerAppid(const std::string & appid);
-
 private:
     std::string m_widgetSource;                   // Source widget zip file/widget url
-    std::string m_appid;                        //id of app
     std::string m_pkgid;                        //id of package
     std::string m_iconPath;                       //installed icon path
     WrtDB::PackagingType m_type;