From 59bfb6f60306dfc9abe4a664a0a288dfbad25fa6 Mon Sep 17 00:00:00 2001
From: Karol Pawlowski <k.pawlowski@samsung.com>
Date: Thu, 11 Apr 2013 07:18:43 +0200
Subject: [PATCH] Alert on widget update

[Issue#] LINUXWRT-219
[Bug] N/A
[Cause] N/A
[Solution] Remove issues
[Verification] Build wrt-installer

Change-Id: Ibaa5523385597f3827cadd05b290a99fbb3a0030
---
 src/jobs/widget_install/job_widget_install.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/jobs/widget_install/job_widget_install.cpp b/src/jobs/widget_install/job_widget_install.cpp
index 8579e9a..fe6103f 100644
--- a/src/jobs/widget_install/job_widget_install.cpp
+++ b/src/jobs/widget_install/job_widget_install.cpp
@@ -585,6 +585,10 @@ ConfigureResult JobWidgetInstall::checkWidgetUpdate(
     LogInfo("incoming version = '" << update.incomingVersion);
     LogInfo("Tizen AppID = " << update.tzAppId);
 
+    if (update.existingVersion.IsNull() || update.incomingVersion.IsNull()) {
+        return ConfigureResult::Failed;
+    }
+
     // Check running state
     bool isRunning = false;
     int retval =
@@ -769,9 +773,16 @@ WidgetUpdateInfo JobWidgetInstall::detectWidgetUpdate(
     }
 
     WidgetDAOReadOnly dao(tizenId);
+
+    OptionalWidgetVersion optVersion;
+    DPL::OptionalString version = dao.getVersion();
+    if (!version.IsNull()) {
+        optVersion = OptionalWidgetVersion(WidgetVersion(*version));
+    }
+
     return WidgetUpdateInfo(
         dao.getTzAppId(),
-        WidgetVersion(*dao.getVersion()),
+        optVersion,
         incomingVersion);
 }
 
-- 
2.7.4