From: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
Date: Tue, 19 May 2015 12:54:37 +0000 (+0200)
Subject: [SecureElement] Fixed implementation of isPresent().
X-Git-Tag: submit/tizen_tv/20150603.064601^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0676eba32b9ac0fb4246fb8bbe4db1ab29f2c5b3;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[SecureElement] Fixed implementation of isPresent().

Change-Id: I5079650ae7a1bcf4cbd6bc287904e4b1327b2f23
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
---

diff --git a/src/secureelement/secureelement_api.js b/src/secureelement/secureelement_api.js
index 233456ca..0290a45d 100644
--- a/src/secureelement/secureelement_api.js
+++ b/src/secureelement/secureelement_api.js
@@ -153,7 +153,13 @@ function Reader(reader_handle) {
                         set: function() {},
                         get: function() {
                             var callArgs = { handle: reader_handle };
-                            return native_.callSync('SEReader_isPresent', callArgs);
+                            var result = native_.callSync('SEReader_isPresent', callArgs);
+                            if (native_.isFailure(result)) {
+                              console.log('SEReader_isPresent error: ' + native_.getErrorObject(result));
+                              return false;
+                            } else {
+                              return native_.getResultObject(result).isPresent;
+                            }
                         }},
         _handle:    {   configurable: false,
                         enumerable: false,
diff --git a/src/secureelement/secureelement_reader.cc b/src/secureelement/secureelement_reader.cc
index 8a6720c8..3ad2845f 100644
--- a/src/secureelement/secureelement_reader.cc
+++ b/src/secureelement/secureelement_reader.cc
@@ -48,7 +48,7 @@ picojson::value SEReader::isPresent() {
     picojson::object& obj = result.get<picojson::object>();
 
     if(m_reader) {
-        obj.insert(std::make_pair("name", picojson::value(m_reader->isSecureElementPresent())));
+        obj.insert(std::make_pair("isPresent", picojson::value(m_reader->isSecureElementPresent())));
     }
 
     return result;