From bbf3bfdf07047b51b09038c612449aad562c4f58 Mon Sep 17 00:00:00 2001
From: Piotr Kosko <p.kosko@samsung.com>
Date: Thu, 25 May 2017 14:10:25 +0200
Subject: [PATCH] fixed setters of DownloadRequest

[Verification] Code checked with chrome console.
  TCT passrate 100%.

Change-Id: I7c9976efaf900452ee3da63fb13a3de1f0fa4466
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>
---
 src/download/download_api.js      | 28 ++++++++++++++++++++++------
 src/download/download_instance.cc | 10 ++++++----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/download/download_api.js b/src/download/download_api.js
index 8e5d9c18..331fcdc3 100755
--- a/src/download/download_api.js
+++ b/src/download/download_api.js
@@ -19,6 +19,7 @@ var privUtils_ = xwalk.utils;
 var validator_ = xwalk.utils.validator;
 var types_ = validator_.Types;
 var check_ = xwalk.utils.type;
+var converter_ = xwalk.utils.converter;
 
 
 var callbackId = 0;
@@ -126,7 +127,10 @@ var DownloadNetworkType = {
 tizen.DownloadRequest = function(url, destination, fileName, networkType, httpHeader) {
   validator_.isConstructorCall(this, tizen.DownloadRequest);
 
-  var url_ = url;
+  var url_ = converter_.toString(url);
+  var destination_ = destination === undefined ? '' : converter_.toString(destination);
+  var fileName_ = fileName === undefined ? '' : converter_.toString(fileName);
+
   var networkType_;
 
   if (networkType === undefined || !(networkType in DownloadNetworkType)) {
@@ -143,19 +147,31 @@ tizen.DownloadRequest = function(url, destination, fileName, networkType, httpHe
       },
       set: function(value) {
         if (value !== null) {
-          url_ = value;
+          url_ = converter_.toString(value);
         }
       },
     },
     'destination': {
-      writable: true,
       enumerable: true,
-      value: destination === undefined ? '' : destination,
+      get: function() {
+        return destination_;
+      },
+      set: function(value) {
+        if (value !== null) {
+          destination_ = converter_.toString(value);
+        }
+      },
     },
     'fileName': {
-      writable: true,
       enumerable: true,
-      value: fileName === undefined ? '' : fileName,
+      get: function() {
+        return fileName_;
+      },
+      set: function(value) {
+        if (value !== null) {
+          fileName_ = converter_.toString(value);
+        }
+      },
     },
     'networkType': {
       enumerable: true,
diff --git a/src/download/download_instance.cc b/src/download/download_instance.cc
index 0950619d..490c183b 100755
--- a/src/download/download_instance.cc
+++ b/src/download/download_instance.cc
@@ -483,6 +483,7 @@ void DownloadInstance::DownloadManagerStart
   LoggerD("Entered");
   CHECK_PRIVILEGE_ACCESS(kPrivilegeDownload, &out);
   CHECK_EXIST(args, "callbackId", out)
+  CHECK_EXIST(args, "url", out)
 
   int ret;
   std::string networkType;
@@ -490,23 +491,24 @@ void DownloadInstance::DownloadManagerStart
   DownloadInfoPtr diPtr(new DownloadInfo);
 
   diPtr->callbackId = static_cast<int>(args.get("callbackId").get<double>());
-  diPtr->url = args.get("url").get<std::string>();
+  diPtr->url = args.get("url").is<std::string>() ? args.get("url").get<std::string>() : "";
 
   if (!args.get("destination").is<picojson::null>()) {
-    if (args.get("destination").get<std::string>() != "") {
+    if (args.get("destination").is<std::string>() && args.get("destination").get<std::string>() != "") {
       diPtr->destination = args.get("destination").get<std::string>();
       diPtr->destination = common::FilesystemProvider::Create().GetRealPath(diPtr->destination);
     }
   }
 
   if (!args.get("fileName").is<picojson::null>()) {
-    if (args.get("fileName").get<std::string>() != "") {
+    if (args.get("fileName").is<std::string>() && args.get("fileName").get<std::string>() != "") {
       diPtr->file_name = args.get("fileName").get<std::string>();
     }
   }
 
   if (!args.get("networkType").is<picojson::null>()) {
-    networkType = args.get("networkType").get<std::string>();
+    networkType = args.get("networkType").is<std::string>() ?
+        args.get("networkType").get<std::string>() : "ALL";
   }
 
   bool network_support = false;
-- 
2.34.1