NFC module update

remove card emulator support update API priviledge
zhizhangchen · Apr 11, 2013 · 8aaf3a8 · 8aaf3a8
1 parent 03740c8
commit 8aaf3a8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/lib/ripple/platform/tizen/2.0/NDEFMessage.js b/lib/ripple/platform/tizen/2.0/NDEFMessage.js
@@ -15,6 +15,7 @@
  */
 
 module.exports = function (ndefRecords) {
+    //TODO: NDEFMessage doesn't support rawData constructor
     var _self,
         _ndefRecords = ndefRecords || [],
         space = " ",

diff --git a/lib/ripple/platform/tizen/2.0/nfc.js b/lib/ripple/platform/tizen/2.0/nfc.js
@@ -48,11 +48,10 @@ var db = require('ripple/db'),
         connectedState : false
     },
     _security = {
-        "http://tizen.org/privilege/nfc.common": ["getDefaultAdapter", "getCachedMessage"],
-        "http://tizen.org/privilege/nfc.admin": ["setPowered", "setCardEmulation"],
+        "http://tizen.org/privilege/nfc.admin": ["setPowered"],
+        "http://tizen.org/privilege/nfc.common": ["getDefaultAdapter", "getCachedMessage", "toByte"],
+        "http://tizen.org/privilege/nfc.p2p": ["setPeerListener", "unsetPeerListener", "setReceiveNDEFListener", "unsetReceiveNDEFListener", "sendNDEF"],
         "http://tizen.org/privilege/nfc.tag": ["setTagListener", "unsetTagListener", "readNDEF", "writeNDEF", "transceive"],
-        "http://tizen.org/privilege/nfc.p2p": ["setPeerListener", "unsetPeerListener", "sendNDEF"],
-        "http://tizen.org/privilege/nfc.cardemulation": ["setCardEmulationChangeListener", "unsetCardEmulationChangeListener"],
         all: true
     },
     _self;
@@ -390,9 +389,9 @@ NFCAdapter = function () {
 
     nfcAdapter = {
         setPowered : setPowered,
-        setCardEmulation: setCardEmulation,
-        setCardEmulationChangeListener: setCardEmulationChangeListener,
-        unsetCardEmulationChangeListener: unsetCardEmulationChangeListener,
+        //setCardEmulation: setCardEmulation,
+        //setCardEmulationChangeListener: setCardEmulationChangeListener,
+        //unsetCardEmulationChangeListener: unsetCardEmulationChangeListener,
         setTagListener : setTagListener,
         setPeerListener : setPeerListener,
         unsetTagListener : unsetTagListener,
@@ -529,7 +528,7 @@ NFCTag = function (type, isSupportedNDEF, ndefSize, properties, isConnected, nde
         readNDEF : readNDEF,
         writeNDEF : writeNDEF,
         transceive : transceive,
-        formatNDEF : formatNDEF
+        //formatNDEF : formatNDEF
     };
 
     nfcTag.__defineGetter__("type", function () {
@@ -562,6 +561,9 @@ NFCPeer = function (isConnected) {
 
     // Registers a callback function to be invoked when NDEF message is received from NFC peer-to-peer target connected.
     function setReceiveNDEFListener(successCallback, errorCallback) {
+        if (!_security.all && !_security.setReceiveNDEFListener) {
+            throw new WebAPIError(errorcode.SECURITY_ERR);
+        }
         function _setReceiveNDEFListener() {
             if (!isConnected) {
                 if (errorCallback) {
@@ -577,6 +579,9 @@ NFCPeer = function (isConnected) {
 
     // Unregisters the listener for receiving NDEFMessage from NFC peer-to-peer target connected.
     function unsetReceiveNDEFListener() {
+        if (!_security.all && !_security.unsetReceiveNDEFListener) {
+            throw new WebAPIError(errorcode.SECURITY_ERR);
+        }
 
         _data.listener.onNDEFReceived = null;
     }

diff --git a/lib/ripple/platform/tizen/2.0/spec.js b/lib/ripple/platform/tizen/2.0/spec.js
@@ -200,7 +200,7 @@ module.exports = {
                 },
                 nfc: {
                     path: "tizen/2.0/nfc",
-                    feature: "http://tizen.org/privilege/nfc.common|http://tizen.org/privilege/nfc.admin|http://tizen.org/privilege/nfc.tag|http://tizen.org/privilege/nfc.p2p|http://tizen.org/privilege/nfc.cardemulation",
+                    feature: "http://tizen.org/privilege/nfc.common|http://tizen.org/privilege/nfc.admin|http://tizen.org/privilege/nfc.tag|http://tizen.org/privilege/nfc.p2p",
                     handleSubfeatures: true
                 },
                 NDEFMessage: {

diff --git a/lib/ripple/platform/tizen/2.0/spec/config.js b/lib/ripple/platform/tizen/2.0/spec/config.js
@@ -707,7 +707,6 @@ module.exports = {
                                          "http://tizen.org/privilege/bluetooth.gap", "http://tizen.org/privilege/bluetooth.spp",
                                          "http://tizen.org/privilege/nfc.common", "http://tizen.org/privilege/nfc.admin",
                                          "http://tizen.org/privilege/nfc.tag", "http://tizen.org/privilege/nfc.p2p",
-                                         "http://tizen.org/privilege/nfc.cardemulation",
                                          "http://tizen.org/privilege/content.read", "http://tizen.org/privilege/content.write",
                                          "http://tizen.org/privilege/systeminfo",
                                          "http://tizen.org/privilege/setting",