Fixed to update progress enum

[Issue#] N/A
[Problem] there are some error progress enum to pkgmgr.
[Cause] progress enum list was wrong.
[Solution] rebuild progress enum list.
[SCMRequest] N/A

diff --git a/src/jobs/widget_install/task_certificates.cpp b/src/jobs/widget_install/task_certificates.cpp
index 3854ad6..b4a67f7 100644 (file)
--- a/src/jobs/widget_install/task_certificates.cpp
+++ b/src/jobs/widget_install/task_certificates.cpp
@@ -73,6 +73,10 @@ void TaskCertificates::StepSetCertiInfo()
     if (pkgmgr_installer_destroy_certinfo_set_handle(m_pkgHandle) < 0) {
         LogError("pkgmgrInstallerDestroyCertinfoSetHandle fail");
     }
+
+    m_context.job->UpdateProgress(
+            InstallerContext::INSTALL_SET_CERTINFO,
+            "Save certinfo to pkgmgr");
 }
 
 void TaskCertificates::SetCertiInfo(CertificateSource source)

diff --git a/src/jobs/widget_install/task_encrypt_resource.cpp b/src/jobs/widget_install/task_encrypt_resource.cpp
index 81e6014..a7483f0 100644 (file)
--- a/src/jobs/widget_install/task_encrypt_resource.cpp
+++ b/src/jobs/widget_install/task_encrypt_resource.cpp
@@ -176,6 +176,9 @@ void TaskEncryptResource::StepEncryptResource()
                                                         widgetConfig.tzAppid));
 
     EncryptDirectory(m_context.locations->getTemporaryRootDir());
+    m_context.job->UpdateProgress(
+            InstallerContext::INSTALL_ECRYPTION_FILES,
+            "Ecrypt resource files");
 }
 
 void TaskEncryptResource::EncryptDirectory(std::string path)

diff --git a/src/jobs/widget_install/task_plugins_copy.cpp b/src/jobs/widget_install/task_plugins_copy.cpp
index c91f7c2..1b6d02e 100644 (file)
--- a/src/jobs/widget_install/task_plugins_copy.cpp
+++ b/src/jobs/widget_install/task_plugins_copy.cpp
@@ -26,6 +26,7 @@
 #include <dpl/string.h>
 #include <dpl/utils/wrt_utility.h>
 #include <dpl/errno_string.h>
+#include <widget_install/job_widget_install.h>
 #include <widget_install_context.h>
 #include <widget_install/widget_install_errors.h>
 #include <dpl/exception.h>
@@ -195,6 +196,10 @@ void TaskPluginsCopy::StepCopyPlugins()
                  "Failed to plugins source remove directory");
     }
     LogDebug("Plugins copying step ended");
+
+    m_context.job->UpdateProgress(
+            InstallerContext::INSTALL_PLUGINS_COPY,
+            "Plugins copy");
 }
 
 void TaskPluginsCopy::StepCopyingFinished()

diff --git a/src/jobs/widget_install/widget_install_context.h b/src/jobs/widget_install/widget_install_context.h
index 510926c..affe621 100644 (file)
--- a/src/jobs/widget_install/widget_install_context.h
+++ b/src/jobs/widget_install/widget_install_context.h
@@ -47,38 +47,32 @@ struct InstallerContext
     {
         INSTALL_START = 0,
         INSTALL_CHECK_FILE,
-        INSTALL_CREATE_TEMPDIR,
         INSTALL_UNZIP_FILES,
         INSTALL_WIDGET_CONFIG1,
         INSTALL_WIDGET_CONFIG2,
-        INSTALL_WIDGET_CONFIG3,
-        INSTALL_WIDGET_CONFIG4,
-        INSTALL_WIDGET_CONFIG5,
         INSTALL_DIGSIG_CHECK,
         INSTALL_CERT_CHECK,
-        INSTALL_DB_UPDATE,
+        INSTALL_ECRYPTION_FILES,
         INSTALL_DIR_CREATE,
         INSTALL_RENAME_PATH,
 
-        INSTALL_CREATE_BACKUP_DIR = INSTALL_DB_UPDATE, /* For Update */
+        INSTALL_CREATE_BACKUP_DIR,                     /* For Update */
         INSTALL_BACKUP_RES_FILES,                      /* For Update */
         INSTALL_BACKUP_EXEC,                           /* For Update */
-        INSTALL_NEW_DB_INSERT,                         /* For Update */
 
-        INSTALL_ACE_PREPARE,
-        INSTALL_ACE_CHECK,
         INSTALL_SMACK_ENABLE,
         INSTALL_BACKUP_ICONFILE,                         /* For Update */
         INSTALL_COPY_ICONFILE,
         INSTALL_CREATE_EXECFILE,
         INSTALL_CREATE_MANIFEST,
-        INSTALL_CREATE_DESKTOP,
         INSTALL_CREATE_SHORTCUT,
+        INSTALL_SET_CERTINFO,
         INSTALL_INSTALL_OSPSVC,
-
-        INSTALL_UPDATE_DESKTOP = INSTALL_CREATE_DESKTOP, /* For Update */
-        INSTALL_DELETE_OLD_DB,                           /* For Update */
         INSTALL_REMOVE_BACKUP_FILE,
+        INSTALL_PLUGINS_COPY,
+        INSTALL_NEW_DB_INSERT,
+        INSTALL_ACE_PREPARE,
+        INSTALL_ACE_CHECK,
 
         INSTALL_END
     } InstallStep;