Fix widget version support

[Issue#] N/A
[Problem] wrt-installer was able to install older or the save version of the widget
[Cause] N/A
[Solution] Check version before installation
[SCMRequest] N/A

Change-Id: Id00d0a0587526e457290e32ff572545fa7972f17

diff --git a/src/jobs/job_exception_error.h b/src/jobs/job_exception_error.h
index 1caba99..86e5a18 100644 (file)
--- a/src/jobs/job_exception_error.h
+++ b/src/jobs/job_exception_error.h
@@ -42,6 +42,7 @@ enum Type
     ErrorPackageNotFound,                       ///<
     ErrorPackageInvalid,                        ///< invalid widget package
     ErrorPackageLowerVersion,                   ///< given version is lower
+    ErrorPackageTheSameVersion,                 ///< given version is the same
     ErrorPackageExecutableNotFound,
 
     ErrorManifestNotFound = 11,                 ///<

diff --git a/src/jobs/widget_install/job_widget_install.cpp b/src/jobs/widget_install/job_widget_install.cpp
index 73efb6c..41d07ad 100644 (file)
--- a/src/jobs/widget_install/job_widget_install.cpp
+++ b/src/jobs/widget_install/job_widget_install.cpp
@@ -128,6 +128,9 @@ class InstallerTaskFail :
         } else if (m_result == ConfigureResult::Failed_LowerVersion) {
             ThrowMsg(Jobs::WidgetInstall::Exceptions::PackageLowerVersion,
                     "package version is lower than installed version");
+        } else if (m_result == ConfigureResult::Failed_TheSameVersion) {
+            ThrowMsg(Jobs::WidgetInstall::Exceptions::PackageTheSameVersion,
+                    "package version is the same as installed version");
         } else if (m_result == ConfigureResult::Failed_AlreadyInstalled) {
             ThrowMsg(Jobs::WidgetInstall::Exceptions::PackageAlreadyInstalled,
                     "package is already installed");
@@ -562,6 +565,16 @@ ConfigureResult JobWidgetInstall::checkWidgetUpdate(
     LogInfo("incoming version = '" << update.incomingVersion);
     LogInfo("Tizen AppID = " << update.tzAppId);
 
+    if (update.incomingVersion < update.existingVersion) {
+        LogError("Widget is older than installed one.");
+        return ConfigureResult::Failed_LowerVersion;
+    }
+
+    if (update.incomingVersion == update.existingVersion) {
+        LogError("Widget is already installed in this version.");
+        return ConfigureResult::Failed_TheSameVersion;
+    }
+
     // Check running state
     bool isRunning = false;
     int ret =

diff --git a/src/jobs/widget_install/job_widget_install.h b/src/jobs/widget_install/job_widget_install.h
index 2b2f120..909c0ee 100644 (file)
--- a/src/jobs/widget_install/job_widget_install.h
+++ b/src/jobs/widget_install/job_widget_install.h
@@ -44,6 +44,7 @@ enum class ConfigureResult
     Failed,
     Failed_InvalidConfig,
     Failed_LowerVersion,
+    Failed_TheSameVersion,
     Failed_AlreadyInstalled,
     Failed_WidgetRunning,
     Failed_DrmError,

diff --git a/src/jobs/widget_install/widget_install_errors.h b/src/jobs/widget_install/widget_install_errors.h
index 653c84d..b24f511 100644 (file)
--- a/src/jobs/widget_install/widget_install_errors.h
+++ b/src/jobs/widget_install/widget_install_errors.h
@@ -45,6 +45,7 @@ DECLARE_JOB_EXCEPTION(Base, PluginsSubdirectory, ErrorPackageInvalid)
 DECLARE_JOB_EXCEPTION(Base, RDSDeltaFailure, ErrorPackageInvalid)
 
 DECLARE_JOB_EXCEPTION(Base, PackageLowerVersion, ErrorPackageLowerVersion)
+DECLARE_JOB_EXCEPTION(Base, PackageTheSameVersion, ErrorPackageTheSameVersion)
 
 DECLARE_JOB_EXCEPTION(Base, ManifestInvalid, ErrorManifestInvalid)