[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 233456cafb7ed6f77fe3155d8c2fde75338cf95d..0290a45d829710dde5f89bf669fb6c9825ae9253 100644 (file)
--- 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 8a6720c8feb727fd4f2ed21e29036ffdb9c78bc0..3ad2845fb7427a0760150b025d1cdc507543f1b2 100644 (file)
--- 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;