[MediaKey] Fix setMediaKeyEventListener method

[Verification]
Below TCT should pass:
MediaKeyEventCallback_onpressed
MediaKeyEventCallback_onreleased

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

diff --git a/src/mediakey/mediakey_api.js b/src/mediakey/mediakey_api.js
index feae3b42e09b43961311a9492c10e30b5db3951f..fd89c25d24164abc4b35e21597577ba04e3f4cb4 100644 (file)
--- a/src/mediakey/mediakey_api.js
+++ b/src/mediakey/mediakey_api.js
@@ -33,10 +33,10 @@ MediaKeyManager.prototype.setMediaKeyEventListener = function(callback) {
     native.removeListener(ON_RELEASED_MEDIA_KEY_EVENT_CALLBACK);
 
     native.addListener(ON_PRESSED_MEDIA_KEY_EVENT_CALLBACK, function(msg) {
-        native.callIfPossible(args.callback.onpressed, native.getResultObject(msg.type));
+        native.callIfPossible(args.callback.onpressed, msg.type);
     });
     native.addListener(ON_RELEASED_MEDIA_KEY_EVENT_CALLBACK, function(msg) {
-        native.callIfPossible(args.callback.onpressed, native.getResultObject(msg.type));
+        native.callIfPossible(args.callback.onreleased, msg.type);
     });
 
 };

diff --git a/src/mediakey/mediakey_instance.cc b/src/mediakey/mediakey_instance.cc
index 9d25b6c6224ea3bcd5b678d250f69beade6809b7..8311ac562435dfe6dcbe595ff1f21a68e6a44243 100644 (file)
--- a/src/mediakey/mediakey_instance.cc
+++ b/src/mediakey/mediakey_instance.cc
@@ -36,6 +36,7 @@ MediaKeyInstance::MediaKeyInstance() {
 
 MediaKeyInstance::~MediaKeyInstance() {
   LoggerD("Entered");
+  MediaKeyManager::GetInstance().UnregisterMediaKeyEventListener();
 }
 
 void MediaKeyInstance::SetMediaKeyEventListener(const picojson::value& args,
@@ -80,7 +81,7 @@ void MediaKeyInstance::PostEvent(const std::string& eventCallback,
     picojson::value event = picojson::value(picojson::object());
     picojson::object& obj = event.get<picojson::object>();
     obj["listenerId"] = picojson::value(eventCallback);
-    obj["type"] = picojson::value(k->second);
+    obj["type"] = picojson::value((k->second).c_str());
     PostMessage(event.serialize().c_str());
   }
   else {