From: Tomasz Marciniak Date: Sun, 27 Nov 2016 06:31:13 +0000 (+0900) Subject: [Convergence] Fixed ClientInfo in JS layer. X-Git-Tag: submit/tizen/20161128.110522^2~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b3da85eb5cfcde5b214385ef367d07cdfb58938;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Convergence] Fixed ClientInfo in JS layer. [Verification] Code compiles. Change-Id: Iaaa100eaeff4a48e45eba3688f96cd22c244ede6 Signed-off-by: Tomasz Marciniak --- diff --git a/src/convergence/convergence_api.js b/src/convergence/convergence_api.js index a61c8c36..1013663e 100644 --- a/src/convergence/convergence_api.js +++ b/src/convergence/convergence_api.js @@ -678,15 +678,10 @@ native_.addListener('APP_COMMUNICATION_SERVICE_LISTENER', function(result) { case 'onRead': var clients_array = []; - for(var i = 0; i < result.payload.length; i++) { if (result.payload[i].key === 'client_list') { var value = JSON.parse(result.payload[i].value); - var client = new ClientInfo( - converter_.toBoolean(value.isHost, false), - converter_.toString(value.clientId, false), - converter_.toLong(value.connectTime, false) - ); + var client = new ClientInfo(value); clients_array.push(client); } } @@ -703,15 +698,6 @@ native_.addListener('APP_COMMUNICATION_SERVICE_LISTENER', function(result) { console.log('Ignoring result type: [' + result_type + ']'); break; } - - /* - // TODO uncomment when implemented (or remove thid data from the protocol) - *var clientInfo = new ClientInfo( - result.clientInfo.isHost, - result.clientInfo.lientId, - result.clientInfo.connectionTime);* - var clientInfo = null; - */ } }); @@ -1086,11 +1072,25 @@ function ChannelInfo(uri_, id_) { }); } -function ClientInfo(isHost, clientId, connectionTime) { +function ClientInfo(data) { validator_.isConstructorCall(this, ClientInfo); - this.isHost = isHost; - this.clientId = clientId; - this.connectionTime = connectionTime; + Object.defineProperties(this, { + isHost: { + value: converter_.toBoolean(data.isHost), + writable: false, + enumerable: true + }, + clientId: { + value: converter_.toString(data.clientId), + writable: false, + enumerable: true + }, + connectionTime: { + value: converter_.toLong(data.connectTime), + writable: false, + enumerable: true + } + }); } exports = new ConvergenceManager();