[Release] wrt-installer_0.1.114

[framework/web/wrt-installer.git] / src / jobs / widget_install / task_database.cpp

diff --git a/src/jobs/widget_install/task_database.cpp b/src/jobs/widget_install/task_database.cpp
index de10e4a..49020fc 100644 (file)
--- a/src/jobs/widget_install/task_database.cpp
+++ b/src/jobs/widget_install/task_database.cpp
@@ -54,12 +54,14 @@ TaskDatabase::TaskDatabase(InstallerContext& context) :
     m_handleToRemove(INVALID_WIDGET_HANDLE),
     m_handle(INVALID_WIDGET_HANDLE)
 {
+    AddStep(&TaskDatabase::StartStep);
     AddStep(&TaskDatabase::StepRegisterExternalFiles);
     AddStep(&TaskDatabase::StepWrtDBInsert);
     AddStep(&TaskDatabase::StepAceDBInsert);
     AddStep(&TaskDatabase::StepSecurityOriginDBInsert);
     AddStep(&TaskDatabase::StepRemoveExternalFiles);
     AddStep(&TaskDatabase::StepLiveboxDBInsert);
+    AddStep(&TaskDatabase::EndStep);
 
     AddAbortStep(&TaskDatabase::StepAbortDBInsert);
     AddAbortStep(&TaskDatabase::StepAbortAceDBInsert);
@@ -92,13 +94,13 @@ void TaskDatabase::StepWrtDBInsert()
                          "Given tizenId not found for update installation");
             }
 
-            WidgetDAO::backupAndUpdateWidget(
-                m_backAppId,
-                m_context.widgetConfig.tzAppid,
-                m_context.widgetConfig,
-                m_context.widgetSecurity);
-            m_handle = WidgetDAOReadOnly::getHandle(
-                    m_context.widgetConfig.tzAppid);
+            WidgetDAO::updateTizenAppId(m_context.widgetConfig.tzAppid,
+                                        m_backAppId);
+            WidgetDAO::registerWidget(m_context.widgetConfig.tzAppid,
+                                      m_context.widgetConfig,
+                                      m_context.widgetSecurity);
+            m_handle =
+                WidgetDAOReadOnly::getHandle(m_context.widgetConfig.tzAppid);
         } else { //new installation
             LogDebug("Registering widget...");
             WidgetDAO::registerWidget(
@@ -176,10 +178,6 @@ void TaskDatabase::StepSecurityOriginDBInsert()
             }
         }
     }
-
-    m_context.job->UpdateProgress(
-        InstallerContext::INSTALL_NEW_DB_INSERT,
-        "New Widget DB UPDATE Finished");
 }
 
 void TaskDatabase::StepRegisterExternalFiles()
@@ -252,8 +250,9 @@ void TaskDatabase::StepAbortDBInsert()
     Try
     {
         if (m_context.isUpdateMode) {
-            WidgetDAO::restoreUpdateWidget(m_backAppId,
-                    m_context.widgetConfig.tzAppid);
+            WidgetDAO::unregisterWidget(m_context.widgetConfig.tzAppid);
+            WidgetDAO::updateTizenAppId(m_backAppId,
+                                        m_context.widgetConfig.tzAppid);
         } else {
             WidgetDAO::unregisterWidget(m_context.widgetConfig.tzAppid);
         }
@@ -319,5 +318,15 @@ void TaskDatabase::StepLiveboxDBInsert()
                 autoLaunch, mouseEvent, pdFastOpen);
     }
 }
+
+void TaskDatabase::StartStep()
+{
+    LogDebug("--------- <TaskDatabase> : START ----------");
+}
+
+void TaskDatabase::EndStep()
+{
+    LogDebug("--------- <TaskDatabase> : END ----------");
+}
 } //namespace WidgetInstall
 } //namespace Jobs