[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 1e5d38ca2fd4cb6d951e636e50b13f338a5ab200..c2f013ff2779ff8ea05c6079df46eaa30a2578ee 100644 (file)
--- a/src/secureelement/secureelement_api.js
+++ b/src/secureelement/secureelement_api.js
@@ -141,7 +141,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 0b7c97ffaf71e536ff7197ca43e205a4b025b876..77da67ccb704b1b7b3d32d51ebe4a6fbab7feda9 100644 (file)
--- a/src/secureelement/secureelement_reader.cc
+++ b/src/secureelement/secureelement_reader.cc
@@ -36,7 +36,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;