[InputDevice] Adding synchronous call for registering and unregistering keys

[Verification]
result = tizen.inputdevice.registerKey(
    "XF86AudioRaiseVolume" // if volume-up key is given,
  );
result = tizen.inputdevice.unregisterKey(
    "XF86AudioRaiseVolume" // if volume-up key is given,
  );

Change-Id: Ia11afc4b0b94e467d7e8bdc956b0df713ed67ae5
Signed-off-by: Lukasz Foniok <l.foniok@samsung.com>

diff --git a/src/inputdevice/inputdevice_api.js b/src/inputdevice/inputdevice_api.js
index ba75bbdc921f31d995ce989e8c4874ef4e45d187..4e194571f79449b9d0ec03b37c6425a67a7f28b4 100644 (file)
--- a/src/inputdevice/inputdevice_api.js
+++ b/src/inputdevice/inputdevice_api.js
@@ -96,9 +96,7 @@ InputDeviceManager.prototype.registerKey = function(keyName) {
     {name: 'keyName', type: types.STRING}
   ]);
 
-  var ret = native.callSync('InputDeviceManager_registerKey', {
-    keyName: args.keyName
-  });
+  var ret = native.sendRuntimeSyncMessage('tizen://api/inputdevice/registerKey',args.keyName);
 
   if (native.isFailure(ret)) {
     throw native.getErrorObject(ret);
@@ -114,10 +112,8 @@ InputDeviceManager.prototype.unregisterKey = function(keyName) {
   var args = validator.validateArgs(arguments, [
     {name: 'keyName', type: types.STRING}
   ]);
-
-  var ret = native.callSync('InputDeviceManager_unregisterKey', {
-    keyName: args.keyName
-  });
+  
+  var ret = native.sendRuntimeSyncMessage('tizen://api/inputdevice/unregisterKey',args.keyName);  
 
   if (native.isFailure(ret)) {
     throw native.getErrorObject(ret);

diff --git a/src/inputdevice/inputdevice_instance.cc b/src/inputdevice/inputdevice_instance.cc
index 1d14422f70d13b6bd43b8d2b7817883cdb9c1923..5d48e2c5b43536e82f4d2af5221033044c86b6ea 100644 (file)
--- a/src/inputdevice/inputdevice_instance.cc
+++ b/src/inputdevice/inputdevice_instance.cc
@@ -34,8 +34,6 @@ InputDeviceInstance::InputDeviceInstance() {
     RegisterSyncHandler(c, std::bind(&InputDeviceInstance::x, this, _1, _2));
     REGISTER_SYNC("TVInputDeviceManager_getSupportedKeys", getSupportedKeys);
     REGISTER_SYNC("TVInputDeviceManager_getKey", getKey);
-    REGISTER_SYNC("TVInputDeviceManager_registerKey", registerKey);
-    REGISTER_SYNC("TVInputDeviceManager_unregisterKey", unregisterKey);
     #undef REGISTER_SYNC
 }
 
@@ -77,21 +75,5 @@ void InputDeviceInstance::getKey(const picojson::value& args,
     ReportSuccess(inputDeviceKeyToJson(keyPtr), out);
 }
 
-void InputDeviceInstance::registerKey(const picojson::value& args,
-        picojson::object& out) {
-    LOGD("Enter");
-    std::string keyName = args.get("keyName").get<std::string>();
-    InputDeviceManager::getInstance().registerKey(keyName);
-    ReportSuccess(out);
-}
-
-void InputDeviceInstance::unregisterKey(const picojson::value& args,
-        picojson::object& out) {
-    LOGD("Enter");
-    std::string keyName = args.get("keyName").get<std::string>();
-    InputDeviceManager::getInstance().unregisterKey(keyName);
-    ReportSuccess(out);
-}
-
 }  // namespace inputdevice
 }  // namespace extension

diff --git a/src/inputdevice/inputdevice_instance.h b/src/inputdevice/inputdevice_instance.h
index d8f12b4375c815b7330829e1d8c2542653157622..7f976cdd7b4a5f1a2c16e00c31edf58b7355daf8 100644 (file)
--- a/src/inputdevice/inputdevice_instance.h
+++ b/src/inputdevice/inputdevice_instance.h
@@ -34,8 +34,6 @@ class InputDeviceInstance : public common::ParsedInstance {
     picojson::value inputDeviceKeyToJson(const InputDeviceKeyPtr keyPtr);
     void getSupportedKeys(const picojson::value& args, picojson::object& out);
     void getKey(const picojson::value& args, picojson::object& out);
-    void registerKey(const picojson::value& args, picojson::object& out);
-    void unregisterKey(const picojson::value& args, picojson::object& out);
 };
 
 }  // namespace inputdevice

diff --git a/src/inputdevice/inputdevice_manager.cc b/src/inputdevice/inputdevice_manager.cc
index 74b18a0d549f294ee83846bc97d4faf31c906e82..82dc0a5f4c3a6aa5d5b3198c9abb48a4f114e13c 100755 (executable)
--- a/src/inputdevice/inputdevice_manager.cc
+++ b/src/inputdevice/inputdevice_manager.cc
@@ -75,12 +75,6 @@ InputDeviceKeyPtr InputDeviceManager::getKey(
         return NULL;
     }
 }
-void InputDeviceManager::registerKey(std::string const& keyName) const {
-    LOGD("Enter");
-}
-void InputDeviceManager::unregisterKey(std::string const& keyName) const {
-    LOGD("Enter");
-}
 
 std::vector<InputDeviceKeyPtr> InputDeviceManager::getSupportedKeys() const {
     LOGD("Enter");

diff --git a/src/inputdevice/inputdevice_manager.h b/src/inputdevice/inputdevice_manager.h
index 05dd76a85f8faa185bc7b94f5e976e7219c4f5a9..f089ed1282d06be7fd8fb1c6892ba8427dfe7ef5 100755 (executable)
--- a/src/inputdevice/inputdevice_manager.h
+++ b/src/inputdevice/inputdevice_manager.h
@@ -29,10 +29,6 @@ class InputDeviceManager {
  public:
     InputDeviceKeyPtr getKey(std::string const& keyName) const;
 
-    void registerKey(std::string const& keyName) const;
-
-    void unregisterKey(std::string const& keyName) const;
-
     std::vector<InputDeviceKeyPtr> getSupportedKeys() const;
 
     static InputDeviceManager& getInstance();