[SE] fixes for 3.0

Change-Id: Iaa6bfa1fae9d0d57b86fc89f836bd46f38b8e715
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>

diff --git a/src/secureelement/secureelement_instance.cc b/src/secureelement/secureelement_instance.cc
index 3c9456ae2c17a40c034215c9638b06b99a5fa6db..585f91d5d6febbe7d44ff57ef19947ed7e5db52c 100644 (file)
--- a/src/secureelement/secureelement_instance.cc
+++ b/src/secureelement/secureelement_instance.cc
@@ -163,7 +163,7 @@ void SecureElementInstance::OpenSession(
         LoggerD("Getting response");
 
         picojson::object& obj = response->get<picojson::object>();
-        obj.insert(std::make_pair("callbackId", callback_id));
+        obj.insert(std::make_pair("callbackId", picojson::value(callback_id)));
         PostMessage(response->serialize().c_str());
     };
 
@@ -208,7 +208,7 @@ void SecureElementInstance::OpenBasicChannel( const picojson::value& args, picoj
     auto get_response = [this, callback_id](const std::shared_ptr<picojson::value>& response) -> void {
         LoggerD("Getting response");
         picojson::object& obj = response->get<picojson::object>();
-        obj.insert(std::make_pair("callbackId", callback_id));
+        obj.insert(std::make_pair("callbackId", picojson::value(callback_id)));
         PostMessage(response->serialize().c_str());
     };
 
@@ -250,7 +250,7 @@ void SecureElementInstance::OpenLogicalChannel( const picojson::value& args, pic
     auto get_response = [this, callback_id](const std::shared_ptr<picojson::value>& response) -> void {
         LoggerD("Getting response");
         picojson::object& obj = response->get<picojson::object>();
-        obj.insert(std::make_pair("callbackId", callback_id));
+        obj.insert(std::make_pair("callbackId", picojson::value(callback_id)));
         PostMessage(response->serialize().c_str());
     };
 
@@ -338,7 +338,7 @@ void SecureElementInstance::Transmit( const picojson::value& args, picojson::obj
     auto get_response = [this, callback_id](const std::shared_ptr<picojson::value>& response) -> void {
         LoggerD("Getting response");
         picojson::object& obj = response->get<picojson::object>();
-        obj.insert(std::make_pair("callbackId", callback_id));
+        obj.insert(std::make_pair("callbackId", picojson::value(callback_id)));
         PostMessage(response->serialize().c_str());
     };
 

diff --git a/src/secureelement/secureelement_reader.cc b/src/secureelement/secureelement_reader.cc
index cbcf745724f39fef5221786bdee56a5e552e63ef..0b7c97ffaf71e536ff7197ca43e205a4b025b876 100644 (file)
--- a/src/secureelement/secureelement_reader.cc
+++ b/src/secureelement/secureelement_reader.cc
@@ -23,7 +23,7 @@ picojson::value SEReader::getName() {
     picojson::object& obj = result.get<picojson::object>();
 
     if(m_reader) {
-        obj.insert(std::make_pair("name", m_reader->getName()));
+        obj.insert(std::make_pair("name", picojson::value(m_reader->getName())));
     }
 
     return result;
@@ -36,7 +36,7 @@ picojson::value SEReader::isPresent() {
     picojson::object& obj = result.get<picojson::object>();
 
     if(m_reader) {
-        obj.insert(std::make_pair("name", m_reader->isSecureElementPresent()));
+        obj.insert(std::make_pair("name", picojson::value(m_reader->isSecureElementPresent())));
     }
 
     return result;
@@ -51,8 +51,8 @@ picojson::value SEReader::openSession() {
     if(m_reader) {
         Session *session_ptr = static_cast<Session*>(m_reader->openSessionSync());
 
-        obj.insert(std::make_pair("handle", (double) (long) session_ptr));
-        obj.insert(std::make_pair("isClosed", session_ptr->isClosed()));
+        obj.insert(std::make_pair("handle", picojson::value((double) (long) session_ptr)));
+        obj.insert(std::make_pair("isClosed", picojson::value(session_ptr->isClosed())));
     }
 
     return result;

diff --git a/src/secureelement/secureelement_session.cc b/src/secureelement/secureelement_session.cc
index 994b6cebc7ca7d39db67f77d767e884234fbfb07..aca6b5630af8f05fc18b704bef2104d605db3686 100644 (file)
--- a/src/secureelement/secureelement_session.cc
+++ b/src/secureelement/secureelement_session.cc
@@ -26,8 +26,8 @@ picojson::value SESession::openBasicChannel(const picojson::array& v_aid) {
 
     picojson::value result = picojson::value(picojson::object());
     picojson::object& obj = result.get<picojson::object>();
-    obj.insert(std::make_pair("handle", (double) (long) channel_ptr));
-    obj.insert(std::make_pair("isBasicChannel", channel_ptr->isBasicChannel()));
+    obj.insert(std::make_pair("handle", picojson::value((double) (long) channel_ptr)));
+    obj.insert(std::make_pair("isBasicChannel", picojson::value(channel_ptr->isBasicChannel())));
 
     return result;
 }
@@ -46,8 +46,8 @@ picojson::value SESession::openLogicalChannel(const picojson::array& v_aid) {
 
     picojson::value result = picojson::value(picojson::object());
     picojson::object& obj = result.get<picojson::object>();
-    obj.insert(std::make_pair("handle", (double) (long) channel_ptr));
-    obj.insert(std::make_pair("isBasicChannel", channel_ptr->isBasicChannel()));
+    obj.insert(std::make_pair("handle", picojson::value((double) (long) channel_ptr)));
+    obj.insert(std::make_pair("isBasicChannel", picojson::value(channel_ptr->isBasicChannel())));
 
     return result;
 }
@@ -58,7 +58,7 @@ picojson::value SESession::isClosed() {
     bool is_closed = m_session_ptr->isClosed();
     picojson::value result = picojson::value(picojson::object());
     picojson::object& obj = result.get<picojson::object>();
-    obj.insert(std::make_pair("isClosed", is_closed));
+    obj.insert(std::make_pair("isClosed", picojson::value(is_closed)));
     return result;
 }