[convergence] Fix bug listener method name add,remove->set,unset

Change-Id: Iafde157f24c2f4d14ca332896953c29a846b2c81
Signed-off-by: sangrae.kim <sangrae.kim@samsung.com>

diff --git a/src/convergence/convergence_api.js b/src/convergence/convergence_api.js
index e570e0705bb94f077508eff0c6c08c4d27d11b69..dd7be5c03e9720692c7e853ecab21d6ed63d8797 100644 (file)
--- a/src/convergence/convergence_api.js
+++ b/src/convergence/convergence_api.js
@@ -737,8 +737,8 @@ AppCommunicationService.prototype.send = function(channel, payload, successCallb
     throw native_.getErrorObject(result);
 };
 
-AppCommunicationService.prototype.addListener = function(listenerCallback) {
-  console.log('Entered AppCommunicationService.addListener()');
+AppCommunicationService.prototype.setListener = function(listenerCallback) {
+  console.log('Entered AppCommunicationService.setListener()');
   var args = validator_.validateArgs(arguments, [
     {name: 'listenerCallback', type: types_.FUNCTION}
   ]);
@@ -753,7 +753,7 @@ AppCommunicationService.prototype.addListener = function(listenerCallback) {
       console.log('AppCommunicationServiceCommandListeners ADDED [' + lid + ']');
       console.log('');
 
-  var result = native_.callSync('AppCommunicationService_addListener', {
+  var result = native_.callSync('AppCommunicationService_setListener', {
       deviceId: this._deviceId,
       curListenerId: lid
     });
@@ -763,13 +763,13 @@ AppCommunicationService.prototype.addListener = function(listenerCallback) {
   return args.curListenerId; // TODO return proper index of listener
 };
 
-AppCommunicationService.prototype.removeListener = function(id) {
-  console.log('Entered AppCommunicationService.removeListener()');
+AppCommunicationService.prototype.unsetListener = function(id) {
+  console.log('Entered AppCommunicationService.unsetListener()');
   var args = validator_.validateArgs(arguments, [
     {name: 'id', type: types_.LONG, optional: false}
   ]);
 
-  var result = native_.callSync('AppCommunicationService_removeListener', {
+  var result = native_.callSync('AppCommunicationService_unsetListener', {
       deviceId: this._deviceId
       //curListenerId: id // not needed in below layers
     });

diff --git a/src/convergence/convergence_instance.cc b/src/convergence/convergence_instance.cc
index 48b589b6db54614ddd4083b10f5a6f896b4afca9..e4221b28db4753ba4aa630cddbcd2e75a9c442f7 100644 (file)
--- a/src/convergence/convergence_instance.cc
+++ b/src/convergence/convergence_instance.cc
@@ -67,8 +67,8 @@ ConvergenceInstance::ConvergenceInstance() {
   REGISTER_SYNC("ConvergenceManager_stopDiscovery",
     ConvergenceManagerStopDiscovery);
 
-  REGISTER_SYNC("AppCommunicationService_addListener", AppCommunicationServiceAddListener);
-  REGISTER_SYNC("AppCommunicationService_removeListener", AppCommunicationServiceRemoveListener);
+  REGISTER_SYNC("AppCommunicationService_setListener", AppCommunicationServiceSetListener);
+  REGISTER_SYNC("AppCommunicationService_unsetListener", AppCommunicationServiceUnsetListener);
   //REGISTER_SYNC("Service_createLocalService", ServiceCreateLocal);
   #undef REGISTER_SYNC
   #define REGISTER_ASYNC(c,x) \
@@ -509,7 +509,7 @@ void ConvergenceInstance::AppCommunicationServiceStop(
   ReportSuccess(out);
 }
 
-void ConvergenceInstance::AppCommunicationServiceAddListener(
+void ConvergenceInstance::AppCommunicationServiceSetListener(
   const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
@@ -537,7 +537,7 @@ void ConvergenceInstance::AppCommunicationServiceAddListener(
   ReportSuccess(out);
 }
 
-void ConvergenceInstance::AppCommunicationServiceRemoveListener(
+void ConvergenceInstance::AppCommunicationServiceUnsetListener(
   const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 

diff --git a/src/convergence/convergence_instance.h b/src/convergence/convergence_instance.h
index b38f631a1d1e8eaea6dea9e348beccd3e5e72fb4..cd0ead66393a183685a6fe69e56fbfe26aaef173 100644 (file)
--- a/src/convergence/convergence_instance.h
+++ b/src/convergence/convergence_instance.h
@@ -70,8 +70,8 @@ class ConvergenceInstance : public common::ParsedInstance {
   void AppCommunicationServiceStart(const picojson::value& args, picojson::object& out);
   void AppCommunicationServiceStop(const picojson::value& args, picojson::object& out);
   void AppCommunicationServiceSend(const picojson::value& args, picojson::object& out);
-  void AppCommunicationServiceAddListener(const picojson::value& args, picojson::object& out);
-  void AppCommunicationServiceRemoveListener(const picojson::value& args, picojson::object& out);
+  void AppCommunicationServiceSetListener(const picojson::value& args, picojson::object& out);
+  void AppCommunicationServiceUnsetListener(const picojson::value& args, picojson::object& out);
 
   // App Communication Server Service
   void AppCommunicationServerServiceConstructLocal(const picojson::value& args, picojson::object& out);