From dea495e007dac551c0de8c4881f2f1bbb30034ba Mon Sep 17 00:00:00 2001
From: Tomasz Marciniak <t.marciniak@samsung.com>
Date: Wed, 7 Jan 2015 15:32:13 +0100
Subject: [PATCH] [NFC] Fixed TODO sections.

[Verification] Code compiles without errors.

Change-Id: Ie3b6baef0d8ae9216f829216b76946c44872ef71
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>
---
 src/nfc/nfc_adapter.cc |  5 +----
 src/nfc/nfc_api.js     | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/nfc/nfc_adapter.cc b/src/nfc/nfc_adapter.cc
index 4257af79..87478f26 100644
--- a/src/nfc/nfc_adapter.cc
+++ b/src/nfc/nfc_adapter.cc
@@ -951,10 +951,7 @@ void NFCAdapter::TagWriteNDEF(int tag_id, const picojson::value& args) {
     if(message){
         int result = nfc_tag_write_ndef(m_last_tag_handle, message, NULL, NULL);
 
-        // Message is no more needed - can be removed
-        // TODO: uncomment line below after merging commit
-        // that adds this function
-        //NFCMessageUtils::removeMessageHandle(message)
+        NFCMessageUtils::RemoveMessageHandle(message);
         if (NFC_ERROR_NONE != result){
 
             // for permission related error throw exception
diff --git a/src/nfc/nfc_api.js b/src/nfc/nfc_api.js
index 599416ca..7503d5f2 100644
--- a/src/nfc/nfc_api.js
+++ b/src/nfc/nfc_api.js
@@ -273,13 +273,21 @@ NFCAdapter.prototype.setTagListener  = function() {
         },
         {
             name : 'tagType',
-            type : types_.STRING,
+            type : types_.ARRAY,
+            values : types_.STRING,
             optional : true,
             nullable : true
         }
     ]);
 
-    // TODO: NFCTag type value validation needed here
+    if(!types_.isNullOrUndefined(args.tagType)) {
+        for (var i = 0; i < args.tagType.length; i++) {
+            if (NFCTagType[args.tagType[i]] === undefined) {
+                throw new tizen.WebAPIException(
+                        tizen.WebAPIException.TYPE_MISMATCH_ERR, 'Invalid tag type.');
+            }
+        }
+    }
 
     // Listener object creation
     var listenerCallback = function(message) {
@@ -288,11 +296,10 @@ NFCAdapter.prototype.setTagListener  = function() {
         if('onattach' === message.action) {
             tagObject = new NFCTag(message.id);
 
-            if(!types_.isNullOrUndefined(args.tagType)) {
-                // If filter set for listener then check tag type
-                if(tagObject.type !== args.tagType) {
-                    return;
-                }
+            // If filter is set for listener but tag type is not searched one
+            if(!types_.isNullOrUndefined(args.tagType) &&
+                    args.tagType.indexOf(tagObject.type) < 0) {
+                return;
             }
         }
         args.listener[message.action](tagObject);
-- 
2.34.1