[Convergence] Fixed ClientInfo in JS layer. 20/100320/2
authorTomasz Marciniak <t.marciniak@samsung.com>
Sun, 27 Nov 2016 06:31:13 +0000 (15:31 +0900)
committertaekeun.kang <taekeun.kang@samsung.com>
Mon, 28 Nov 2016 00:00:23 +0000 (09:00 +0900)
[Verification] Code compiles.

Change-Id: Iaaa100eaeff4a48e45eba3688f96cd22c244ede6
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>
src/convergence/convergence_api.js

index a61c8c369dc6837bd75f6e499adb349f72ba83d1..1013663eed70a41c4eca568afcb6ba31228fdb73 100644 (file)
@@ -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();