From b8659e67c3d7b5f9ab6335f3f8eda46ba64a0ba7 Mon Sep 17 00:00:00 2001
From: Eduardo Speroni <edusperoni@users.noreply.github.com>
Date: Wed, 3 Jul 2019 05:52:52 -0300
Subject: [PATCH] fix: full Unicode support in xml (#7428)

---
 .../app/xml-parser-tests/xml-parser-tests.ts  | 26 +++++++++++++++++++
 tns-core-modules/js-libs/easysax/easysax.js   |  4 +--
 tns-core-modules/xml/xml.ts                   |  6 ++---
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/tests/app/xml-parser-tests/xml-parser-tests.ts b/tests/app/xml-parser-tests/xml-parser-tests.ts
index 06b07aec9..7ea0f631f 100644
--- a/tests/app/xml-parser-tests/xml-parser-tests.ts
+++ b/tests/app/xml-parser-tests/xml-parser-tests.ts
@@ -54,6 +54,32 @@ export var test_XmlParser_EntityReferencesInAttributeValuesAreDecoded = function
     TKUnit.assert(data === "<>\"&'", "Expected result: <>\"&'; Actual result: " + data + ";");
 };
 
+export var test_XmlParser_UnicodeEntitiesAreDecoded = function () {
+    var data;
+    var xmlParser = new xmlModule.XmlParser(function (event: xmlModule.ParserEvent) {
+        switch (event.eventType) {
+            case xmlModule.ParserEventType.Text:
+                data = event.data;
+                break;
+        }
+    });
+    xmlParser.parse("<element>&#x1f923;&#x2713;</element>");
+    TKUnit.assert(data === "\uD83E\uDD23\u2713", "Expected result: \uD83E\uDD23\u2713; Actual result: " + data + ";");
+};
+
+export var test_XmlParser_UnicodeEntitiesInAttributeValuesAreDecoded = function () {
+    var data;
+    var xmlParser = new xmlModule.XmlParser(function (event: xmlModule.ParserEvent) {
+        switch (event.eventType) {
+            case xmlModule.ParserEventType.StartElement:
+                data = event.attributes["text"];
+                break;
+        }
+    });
+    xmlParser.parse("<Label text=\"&#x1f923;&#x2713;\"/>");
+    TKUnit.assert(data === "\uD83E\uDD23\u2713", "Expected result: \uD83E\uDD23\u2713; Actual result: " + data + ";");
+};
+
 export var test_XmlParser_OnErrorIsCalledWhenAnErrorOccurs = function () {
     var e;
     var xmlParser = new xmlModule.XmlParser(
diff --git a/tns-core-modules/js-libs/easysax/easysax.js b/tns-core-modules/js-libs/easysax/easysax.js
index 19647854e..f625d6449 100644
--- a/tns-core-modules/js-libs/easysax/easysax.js
+++ b/tns-core-modules/js-libs/easysax/easysax.js
@@ -188,10 +188,10 @@ function rpEntities(s, d, x, z) {
     };
 
     if (d) {
-        return String.fromCharCode(d);
+        return String.fromCodePoint(d);
     };
 
-    return String.fromCharCode(parseInt(x, 16));
+    return String.fromCodePoint(parseInt(x, 16));
 };
 
 function unEntities(s, i) {
diff --git a/tns-core-modules/xml/xml.ts b/tns-core-modules/xml/xml.ts
index f06bbec07..cc11f454f 100644
--- a/tns-core-modules/xml/xml.ts
+++ b/tns-core-modules/xml/xml.ts
@@ -100,17 +100,17 @@ function _HandleAmpEntities(found: string, decimalValue: string, hexValue: strin
         }
         const res = _ampCodes.get(wordValue);
         if (res) {
-            return String.fromCharCode(res);
+            return String.fromCodePoint(res);
         }
 
         // Invalid word; so we just return it
         return found;
     }
     if (decimalValue) {
-        return String.fromCharCode(parseInt(decimalValue, 10));
+        return String.fromCodePoint(parseInt(decimalValue, 10));
     }
 
-    return String.fromCharCode(parseInt(hexValue, 16));
+    return String.fromCodePoint(parseInt(hexValue, 16));
 }
 
 export class XmlParser implements definition.XmlParser {