not really sure why all this happened

Jigsaw-Code · Apr 3, 2024 · f4898fb · f4898fb
1 parent fb89494
commit f4898fb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/client/src/cordova/android/import_messages.mjs b/client/src/cordova/android/import_messages.mjs
@@ -22,7 +22,14 @@ const XML_STRING_ID_PROPERTY = '@name';
 const XML_TEXT_CONTENT = '#';
 
 function escapeXmlCharacters(str) {
-  return str.replace(/"/g, '\\"').replace(/'/g, "\\'").replace(/</g, '\\<').replace(/>/g, '\\>;').replace(/&/g, '\\&').replace(/\//g, "\\\\");
+  // TODO: This is not a safe way to escape XML characters. We should do it properly.
+  return str
+    .replace(/"/g, '\\"')
+    .replace(/'/g, "\\'")
+    .replace(/</g, '\\<')
+    .replace(/>/g, '\\>;')
+    .replace(/&/g, '\\&')
+    .replace(/\//g, "\\\\");
 }
 
 function getNativeLocale(locale) {

diff --git a/client/src/www/karma.conf.js b/client/src/www/karma.conf.js
@@ -14,7 +14,7 @@
 
 const path = require('path');
 
-module.exports = async function (config) {
+module.exports = async function(config) {
   const testConfig = await import('./webpack_test.mjs');
 
   config.set({

diff --git a/client/src/www/ui_components/add-server-view.js b/client/src/www/ui_components/add-server-view.js
@@ -190,7 +190,9 @@ Polymer({
     <paper-dialog id="serverDetectedSheet" with-backdrop no-cancel-on-outside-click>
       <div class="vertical-margin">
         <div class="title">[[localize('server-access-key-detected')]]</div>
-        <div class="faded">[[localize('server-detected')]]</div>
+        <div class="faded">
+          [[localize('server-detected')]]
+        </div>
         <div class="shadow vertical-margin">
           <paper-input value="[[accessKey]]" no-label-float="" disabled="">
             <iron-icon icon="communication:vpn-key" slot="suffix"></iron-icon>
@@ -227,7 +229,7 @@ Polymer({
     },
   },
 
-  ready: function () {
+  ready: function() {
     this.$.serverDetectedSheet.addEventListener('opened-changed', this._openChanged.bind(this));
     this.$.addServerSheet.addEventListener('opened-changed', this._openChanged.bind(this));
     // Workaround for --paper-input-container-input-[focus|invalid] not getting applied.
@@ -236,7 +238,7 @@ Polymer({
     this.$.accessKeyInput.addEventListener('invalid-changed', this._inputInvalidChanged.bind(this));
   },
 
-  openAddServerSheet: function () {
+  openAddServerSheet: function() {
     this.$.serverDetectedSheet.close();
     this.$.addServerSheet.open();
   },
@@ -247,16 +249,16 @@ Polymer({
     this.$.serverDetectedSheet.open();
   },
 
-  isAddingServer: function () {
+  isAddingServer: function() {
     return this.$.serverDetectedSheet.opened;
   },
 
-  close: function () {
+  close: function() {
     this.$.addServerSheet.close();
     this.$.serverDetectedSheet.close();
   },
 
-  _accessKeyChanged: function () {
+  _accessKeyChanged: function() {
     // Use debounce to detect when the user has stopped typing.
     this.debounce(
       'accessKeyChanged',
@@ -267,7 +269,7 @@ Polymer({
     );
   },
 
-  _addServerFromInput: function () {
+  _addServerFromInput: function() {
     var accessKeyInput = this.$.accessKeyInput;
     if (!this.accessKey || this.accessKey === '') {
       accessKeyInput.invalid = false;
@@ -278,12 +280,12 @@ Polymer({
     }
   },
 
-  _addDetectedServer: function () {
+  _addDetectedServer: function() {
     this.fire('AddServerRequested', {accessKey: this.accessKey});
     this.close();
   },
 
-  _ignoreDetectedServer: function () {
+  _ignoreDetectedServer: function() {
     this.fire('IgnoreServerRequested', {accessKey: this.accessKey});
     this.close();
   },

diff --git a/client/src/www/ui_components/privacy-view.js b/client/src/www/ui_components/privacy-view.js
@@ -137,7 +137,7 @@ Polymer({
     rootPath: String,
   },
 
-  _privacyTermsAcked: function () {
+  _privacyTermsAcked: function() {
     this.fire('PrivacyTermsAcked');
   },
 });
diff --git a/client/src/www/ui_components/user-comms-dialog.js b/client/src/www/ui_components/user-comms-dialog.js
@@ -90,7 +90,7 @@ Polymer({
         <div id="title" class="highlight">[[localize(titleLocalizationKey)]]</div>
         <div id="detail">[[localize(detailLocalizationKey)]]</div>
         <div id="buttons">
-          <a hidden$="[[_shouldHideLink()]]" href$="[[linkUrl]]">
+          <a hidden\$="[[_shouldHideLink()]]" href\$="[[linkUrl]]">
             <paper-button>[[localize(linkTextLocalizationKey)]]</paper-button>
           </a>
           <paper-button class="highlight" on-tap="_dismiss"
@@ -132,22 +132,22 @@ Polymer({
     fireEventOnHide: String,
   },
 
-  show: function () {
+  show: function() {
     this.$.wrapper.classList.add('active');
   },
 
-  hide: function () {
+  hide: function() {
     this.$.wrapper.classList.remove('active');
   },
 
-  _dismiss: function () {
+  _dismiss: function() {
     this.hide();
     if (!!this.fireEventOnHide) {
       this.fire(this.fireEventOnHide);
     }
   },
 
-  _shouldHideLink: function () {
+  _shouldHideLink: function() {
     return !this.linkUrl;
   },
 });