From: Karol Pawlowski Date: Thu, 11 Apr 2013 05:18:43 +0000 (+0200) Subject: Alert on widget update X-Git-Tag: accepted/tizen_2.1/20130425.023916~8^2~8 X-Git-Url: http://review.tizen.org/git/?p=framework%2Fweb%2Fwrt-installer.git;a=commitdiff_plain;h=59bfb6f60306dfc9abe4a664a0a288dfbad25fa6 Alert on widget update [Issue#] LINUXWRT-219 [Bug] N/A [Cause] N/A [Solution] Remove issues [Verification] Build wrt-installer Change-Id: Ibaa5523385597f3827cadd05b290a99fbb3a0030 --- 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); }