X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjobs%2Fwidget_install%2Fjob_widget_install.h;h=f0af6f2cc8b41716285cd8a756c870942f61a887;hb=22da51a3726e6645e723a56e2b199206c7610f9a;hp=b323cc339e8d3a32ca41e22515a699b3b7658692;hpb=5291a9e90ddeaae18db44df5eb46561e7f0b943e;p=framework%2Fweb%2Fwrt-installer.git

diff --git a/src/jobs/widget_install/job_widget_install.h b/src/jobs/widget_install/job_widget_install.h
index b323cc3..f0af6f2 100644
--- a/src/jobs/widget_install/job_widget_install.h
+++ b/src/jobs/widget_install/job_widget_install.h
@@ -33,8 +33,23 @@
 #include <dpl/wrt-dao-ro/config_parser_data.h>
 #include "widget_installer_struct.h"
 
+using namespace Jobs::Exceptions;
+
 namespace Jobs {
 namespace WidgetInstall {
+enum class ConfigureResult
+{
+    Ok,
+    Deferred,
+    Updated,
+    Failed,
+    Failed_InvalidConfig,
+    Failed_LowerVersion,
+    Failed_AlreadyInstalled,
+    Failed_WidgetRunning,
+    Failed_DrmError,
+};
+
 class JobWidgetInstall :
     public Job,
     public JobProgressBase<InstallerContext::InstallStep,
@@ -45,17 +60,12 @@ class JobWidgetInstall :
     InstallerContext m_installerContext;
 
     //TODO move it to base class of all jobs -> make it base template class??
-    Exceptions::Type m_exceptionCaught;
+    Jobs::Exceptions::Type m_exceptionCaught;
     std::string m_exceptionMessage;
     WidgetUpdateInfo m_widgetUpdateInfo;
     bool m_needEncryption;
     bool m_isDRM;
 
-    enum class ConfigureResult
-    {
-        Ok, Failed, Deferred, Updated
-    };
-
     ConfigureResult ConfigureInstallation(const std::string &widgetSource,
                                           const WrtDB::ConfigParserData
                                           &configData,
@@ -64,14 +74,14 @@ class JobWidgetInstall :
         const std::string &widgetSource,
         const std::string &tempPath,
         WrtDB::PackagingType pkgType,
-        bool isDRM);
+        bool isDRM,
+        bool isReinstall);
     static WidgetUpdateInfo detectWidgetUpdate(
         const WrtDB::ConfigParserData &configInfo,
-        const WrtDB::WidgetType appType,
         const WrtDB::TizenAppId &tizenId);
-    WidgetUpdateMode::Type CalcWidgetUpdatePolicy(
+    bool isUpperVersion(
         const OptionalWidgetVersion &existingVersion,
-        const OptionalWidgetVersion &incomingVersion) const;
+        const OptionalWidgetVersion &incomingVersion);
     void setTizenId(const WrtDB::ConfigParserData &configInfo);
     void displayWidgetInfo();
     void configureWidgetLocation(const std::string & widgetPath,
@@ -86,6 +96,8 @@ class JobWidgetInstall :
     bool isDRMWidget(std::string widgetPath);
     bool DecryptDRMWidget(std::string widgetPath, std::string destPath);
     ConfigureResult PrePareInstallation(const std::string &widgetPath);
+    bool validateTizenApplicationID(const WrtDB::TizenAppId &tizenAppId);
+    bool validateTizenPackageID(const WrtDB::TizenPkgId &tizenPkgId);
     ConfigureResult checkWidgetUpdate(const WidgetUpdateInfo &update);
     void setApplicationType(const WrtDB::ConfigParserData &configInfo);