Adjusted panel and fixed bugs; version up

Resolved the NFC communication issue in network panel
Adjusted the implementation of Secure Element

Change-Id: I16061774bceeb0668abe076ef8f34c4531537d12
Signed-off-by: Wenchao Wang <wenchao.wang@intel.com>

diff --git a/package/changelog b/package/changelog
index 4952277..f019b81 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,8 @@
+* 2.0.32
+- Resolved the NFC communication issue in network panel
+- Adjusted the implementation of Secure Element
+- Bugs fixing
+== wenchao.wang <wenchao.wang@intel.com> 2014-04-04 15:00
 * 2.0.31
 - Adjustd Bluetooth panel
 - Resolved the communication issue in network panel

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 27aa291..3a04d90 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.0.31
+Version:2.0.32
 Maintainer:hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>
 
 Package:websimulator-core

diff --git a/web/cache.manifest b/web/cache.manifest
index c9e0e49..966c3be 100644 (file)
--- a/web/cache.manifest
+++ b/web/cache.manifest
@@ -98,4 +98,4 @@ images/AboutLogo.png
 images/refreshIcon.png
 images/ui-bg-hashed.png
 images/tizen-sdk-menu.png
-# Manifest build date: Fri Mar 28 2014 13:51:04 GMT+0800 (CST)
\ No newline at end of file
+# Manifest build date: Fri Apr 04 2014 14:27:24 GMT+0800 (CST)
\ No newline at end of file

diff --git a/web/ripple.js b/web/ripple.js
index bf66cf8..2833ba7 100644 (file)
--- a/web/ripple.js
+++ b/web/ripple.js
@@ -1,5 +1,5 @@
 /*! 
-  Ripple Mobile Environment Emulator v0.9.8 :: Built On Fri Mar 28 2014 13:51:03 GMT+0800 (CST)
+  Ripple Mobile Environment Emulator v0.9.8 :: Built On Fri Apr 04 2014 14:27:22 GMT+0800 (CST)
 
                                 Apache License
                            Version 2.0, January 2004
@@ -71338,6 +71338,50 @@ var db = require('ripple/db'),
     _NFC_OUTPUT_MESSAGE = "tizen1.0-nfc-output-message",
     _powered = false,
     _isConnected = false,
+    _tagNDEF,
+    _tagRaw,
+    _peerNDEF,
+    btNodes,
+    _btDeviceTemplate = "",
+    _btSimulatedDevs = {},
+    _btBluetoothDB;
+
+String.prototype.toCharCode = function () {
+    return this.split("").map(function(char) {
+        return char.charCodeAt(0);
+    });
+};
+
+function elementEnableDisableSetting(prop) {
+    jQuery("#nfc-attach-msg").text("\xa0");
+    jQuery("#nfc-peer-send-msg").text("\xa0");
+    if (prop && prop.power !== undefined && prop.power !== null) {
+        if (!prop.power) {
+            $("#nfc-type").removeAttr("disabled");
+        }
+    }
+    if (prop && prop.connectedState !== undefined && prop.connectedState !== null) {
+        if (prop.connectedState) {
+            $("#nfc-type").attr("disabled", "disabled");
+            $("#nfc-tag-type-text").text($("#nfc-tag-type option:selected").text());
+            $("#nfc-tag-type").hide();
+            $("#nfc-tag-type-text").show();
+            $("#nfc-tag-NDEF-support-text").text($("#nfc-tag-NDEF-support option:selected").text());
+            $("#nfc-tag-NDEF-support").hide();
+            $("#nfc-tag-NDEF-support-text").show();
+            $("#nfc-raw-data").attr("disabled", "disabled");
+        } else {
+            $("#nfc-type").removeAttr("disabled");
+            $("#nfc-tag-type").show();
+            $("#nfc-tag-type-text").hide();
+            $("#nfc-tag-NDEF-support").show();
+            $("#nfc-tag-NDEF-support-text").hide();
+            $("#nfc-raw-data").removeAttr("disabled");
+        }
+    }
+}
+
+function _initializeDB() {
     _tagNDEF = {
         type: "GENERIC_TARGET",
         isSupportedNDEF: true,
@@ -71346,98 +71390,68 @@ var db = require('ripple/db'),
             recordCount: 2,
             records: [{
                 tnf: 1,
-                type: "TypeA",
-                id: "ID001",
-                payload: "This is 1st payload"
+                type: "TypeA".toCharCode(),
+                id: "ID001".toCharCode(),
+                payload: "This is 1st payload".toCharCode()
             }, {
                 tnf: 1,
-                type: "TypeA",
-                id: "ID002",
-                payload: "This is 2nd payload"
+                type: "TypeA".toCharCode(),
+                id: "ID002".toCharCode(),
+                payload: "This is 2nd payload".toCharCode()
             }]
         },
         {
             recordCount: 2,
             records: [{
                 tnf: 1,
-                type: "TypeA",
-                id: "ID003",
-                payload: "This is 1st payload"
+                type: "TypeA".toCharCode(),
+                id: "ID003".toCharCode(),
+                payload: "This is 1st payload".toCharCode()
             }, {
                 tnf: 1,
-                type: "TypeA",
-                id: "ID004",
-                payload: "This is 2nd payload"
+                type: "TypeA".toCharCode(),
+                id: "ID004".toCharCode(),
+                payload: "This is 2nd payload".toCharCode()
             }]
         },
         {
             recordCount: 2,
             records: [{
                 tnf: 1,
-                type: "TypeA",
-                id: "ID005",
-                payload: "This is 1st payload"
+                type: "TypeA".toCharCode(),
+                id: "ID005".toCharCode(),
+                payload: "This is 1st payload".toCharCode()
             }, {
                 tnf: 1,
-                type: "TypeA",
-                id: "ID006",
-                payload: "This is 2nd payload"
+                type: "TypeA".toCharCode(),
+                id: "ID006".toCharCode(),
+                payload: "This is 2nd payload".toCharCode()
             }]
         }]
-    },
+    };
+
     _tagRaw = {
         type: "GENERIC_TARGET",
         isSupportedNDEF: false,
         rawData : ""
-    },
+    };
+
     _peerNDEF = {
         ndef: {
             recordCount: 2,
             records: [{
                 tnf: 1,
-                type: "TypeA",
-                id: "ID001",
-                payload: "This is 1st payload"
+                type: "TypeA".toCharCode(),
+                id: "ID001".toCharCode(),
+                payload: "This is 1st payload".toCharCode()
             }, {
                 tnf: 1,
-                type: "TypeA",
-                id: "ID002",
-                payload: "This is 2nd payload"
+                type: "TypeA".toCharCode(),
+                id: "ID002".toCharCode(),
+                payload: "This is 2nd payload".toCharCode()
             }]
         }
-    },
-    btNodes,
-    _btDeviceTemplate = "",
-    _btSimulatedDevs = {},
-    _btBluetoothDB;
-
-function elementEnableDisableSetting(prop) {
-    jQuery("#nfc-attach-msg").text("\xa0");
-    jQuery("#nfc-peer-send-msg").text("\xa0");
-    if (prop && prop.power !== undefined && prop.power !== null) {
-        if (!prop.power) {
-            $("#nfc-type").removeAttr("disabled");
-        }
-    }
-    if (prop && prop.connectedState !== undefined && prop.connectedState !== null) {
-        if (prop.connectedState) {
-            $("#nfc-type").attr("disabled", "disabled");
-            $("#nfc-tag-type-text").text($("#nfc-tag-type option:selected").text());
-            $("#nfc-tag-type").hide();
-            $("#nfc-tag-type-text").show();
-            $("#nfc-tag-NDEF-support-text").text($("#nfc-tag-NDEF-support option:selected").text());
-            $("#nfc-tag-NDEF-support").hide();
-            $("#nfc-tag-NDEF-support-text").show();
-            $("#nfc-raw-data").attr("disabled", "disabled");
-        } else {
-            $("#nfc-type").removeAttr("disabled");
-            $("#nfc-tag-type").show();
-            $("#nfc-tag-type-text").hide();
-            $("#nfc-tag-NDEF-support").show();
-            $("#nfc-tag-NDEF-support-text").hide();
-            $("#nfc-raw-data").removeAttr("disabled");
-        }
-    }
+    };
 }
 
 function _initializeElements() {
@@ -71642,7 +71656,7 @@ function _initializeElements() {
                 return;
             }
             db.saveObject(_NFC_PEER, _peerNDEF);
-            event.trigger("nfc-peer-sending-ndef", [_peerNDEF]);
+            event.trigger("nfc-peer-sending-ndef", []);
         });
 
         // Initialize network bearer selection
@@ -71726,6 +71740,7 @@ module.exports = {
         display: true
     },
     initialize: function () {
+        _initializeDB();
         _initializeElements();
 
         // Events for nfc module
@@ -92925,7 +92940,7 @@ Session = function (channels) {
                 peers = channels.logical;
             }
 
-            channel = new Channel(isBasic, aid);
+            channel = new Channel(isBasic, aid, onChannelClosed);
             peers.push(channel);
 
             successCallback(channel);
@@ -92938,6 +92953,12 @@ Session = function (channels) {
         });
     }
 
+    function onChannelClosed(isBasicChannel) {
+        if (isBasicChannel) {
+            session.locker = null;
+        }
+    }
+
     // public
     function openBasicChannel(aid, successCallback, errorCallback) {
         if (!_security.openBasicChannel) {
@@ -92986,7 +93007,7 @@ Session = function (channels) {
 
         t.Session("getATR", arguments);
 
-        return t.byte(atr.slice(0), "[]");
+        return t.byte(atr, "[]+");
     }
 
     function close() {
@@ -93022,7 +93043,6 @@ Session = function (channels) {
             closeChannel(channels[type]);
             channels[type] = [];
         }
-        session.locker = null;
     }
 
     session.isClosed = false;
@@ -93041,7 +93061,7 @@ Session = function (channels) {
     this.closeChannels      = closeChannels;
 };
 
-Channel = function (isBasic, aid) {
+Channel = function (isBasic, aid, onClosed) {
     var channel = {};
 
     // private
@@ -93074,6 +93094,7 @@ Channel = function (isBasic, aid) {
             return;
 
         channel.isClosed = true;
+        onClosed(channel.isBasicChannel);
     }
 
     function transmit(command, successCallback, errorCallback) {
@@ -93103,7 +93124,7 @@ Channel = function (isBasic, aid) {
 
             event.trigger("SETransmitted", [aid, command]);
 
-            successCallback(t.byte(response, "[]"));
+            successCallback(t.byte(response, "[]+"));
         }, 1);
     }
 
@@ -107183,7 +107204,7 @@ var db = require('ripple/db'),
     t = require('ripple/platform/tizen/2.0/typecast'),
     WebAPIError = require('ripple/platform/tizen/2.0/WebAPIError'),
     WebAPIException = require('ripple/platform/tizen/2.0/WebAPIException'),
-    NDEFRecord = require('ripple/platform/tizen/2.0/NDEFRecordInternal'),
+    NDEFRecord = require('ripple/platform/tizen/2.0/NDEFRecord'),
     NDEFMessage = require('ripple/platform/tizen/2.0/NDEFMessage'),
     NFCAdapter,
     NFCAdapterPrototype,
@@ -117476,6 +117497,9 @@ _self = function (pattern) {
         if (obj instanceof window.tizen[pattern._constructor])
             return true;
 
+        if ("_derived" in pattern)
+            return true;
+
         return false;
     }
 
@@ -117672,6 +117696,9 @@ _self = function (pattern) {
                                 break;
                         }
                         if (ret === null) {
+                            if ("_constructor" in pattern)
+                                break;
+
                             return null;
                         }
                         break;
@@ -117858,7 +117885,7 @@ _self = function (pattern) {
 
                 elementType = _self(pattern[0]);
                 for (i in obj) {
-                    if (obj[i]) {
+                    if (obj[i] !== undefined) {
                         arr[i] = elementType.copy(obj[i]);
                         if (arr[i] === null)
                             return null;
@@ -117919,6 +117946,9 @@ _self = function (pattern) {
                                 break;
                         }
                         if (derived === null) {
+                            if ("_constructor" in pattern)
+                                break;
+
                             return null;
                         }
                         for (attr in derived) {