fix(ui): Unicode handeling in Event.Attributes

berty · Nov 27, 2018 · e88b6d9 · e88b6d9
1 parent 21e732b
commit e88b6d9
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/client/react-native/common/components/Screens/Chats/Detail.js b/client/react-native/common/components/Screens/Chats/Detail.js
@@ -8,6 +8,7 @@ import { fragments } from '../../../graphql'
 import { merge } from '../../../helpers'
 import { shadow } from '../../../styles'
 import { conversation as utils } from '../../../utils'
+import { parseEmbedded } from '../../../helpers/json'
 
 const Message = fragments.Event(props => {
   const conversation = props.navigation.getParam('conversation')
@@ -36,10 +37,7 @@ const Message = fragments.Event(props => {
           [isMyself ? 'left' : 'right']: 42,
         }}
       >
-        {
-          JSON.parse(String.fromCharCode.apply(null, props.data.attributes))
-            .message.text
-        }
+        {parseEmbedded(props.data.attributes).message.text}
       </Text>
       <Text
         left={!isMyself}

diff --git a/client/react-native/common/graphql/subscriptions/ContactRequest.js b/client/react-native/common/graphql/subscriptions/ContactRequest.js
@@ -1,6 +1,7 @@
 import { btoa } from 'b64-lite'
 
 import EventStream from './EventStream'
+import { parseEmbedded } from '../../helpers/json'
 
 export default context => ({
   ...EventStream(context),
@@ -10,9 +11,7 @@ export default context => ({
         updater &&
         ((store, data) => {
           if (data.EventStream.kind === 201) {
-            const attributes = JSON.parse(
-              String.fromCharCode.apply(null, data.EventStream.attributes)
-            )
+            const attributes = parseEmbedded(data.EventStream.attributes)
             attributes.me.id = btoa('contact:' + attributes.me.id)
             return updater && updater(store, attributes.me)
           }

diff --git a/client/react-native/common/graphql/subscriptions/ConversationInvite.js b/client/react-native/common/graphql/subscriptions/ConversationInvite.js
@@ -1,6 +1,7 @@
 import { btoa } from 'b64-lite'
 
 import EventStream from './EventStream'
+import { parseEmbedded } from '../../helpers/json'
 
 export default context => ({
   ...EventStream(context),
@@ -10,9 +11,7 @@ export default context => ({
         updater &&
         ((store, data) => {
           if (data.EventStream.kind === 301) {
-            const attributes = JSON.parse(
-              String.fromCharCode.apply(null, data.EventStream.attributes)
-            )
+            const attributes = parseEmbedded(data.EventStream.attributes)
             attributes.conversation.id = btoa(
               'conversation:' + attributes.conversation.id
             )

diff --git a/client/react-native/common/helpers/json.js b/client/react-native/common/helpers/json.js
@@ -0,0 +1,11 @@
+// eslint-disable-next-line
+let TextDecoder = TextDecoder || undefined
+
+if (TextDecoder === undefined) {
+  const encoding = require('text-encoding')
+  TextDecoder = encoding.TextDecoder
+}
+
+const decoder = new TextDecoder('utf-8')
+
+export const parseEmbedded = serialized => JSON.parse(decoder.decode(new Uint8Array(serialized)))
diff --git a/client/react-native/package.json b/client/react-native/package.json
@@ -38,6 +38,7 @@
     "relay-compiler": "^1.6.2",
     "relay-devtools": "^1.4.0",
     "subscriptions-transport-ws": "^0.9.15",
+    "text-encoding": "^0.7.0",
     "whatwg-url": "^7.0.0"
   },
   "devDependencies": {

diff --git a/client/react-native/yarn.lock b/client/react-native/yarn.lock
@@ -6056,6 +6056,10 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
+text-encoding@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643"
+
 text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"