From: Pawel Andruszkiewicz
Date: Tue, 19 May 2015 12:54:37 +0000 (+0200)
Subject: [SecureElement] Fixed implementation of isPresent().
X-Git-Tag: submit/tizen_mobile/20150612.133019^2~2^2~150^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=215a9966463c11e4da9fc1a38ad787cd6e9c9641;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git
[SecureElement] Fixed implementation of isPresent().
Change-Id: I5079650ae7a1bcf4cbd6bc287904e4b1327b2f23
Signed-off-by: Pawel Andruszkiewicz
---
diff --git a/src/secureelement/secureelement_api.js b/src/secureelement/secureelement_api.js
index 1e5d38ca..c2f013ff 100644
--- 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 0b7c97ff..77da67cc 100644
--- 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();
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;