From 873c9b2669b790fcd4724003aee634454effec16 Mon Sep 17 00:00:00 2001
From: "Sebastian J. Wolf" <sebastian@ygriega.de>
Date: Sat, 3 Oct 2020 20:04:32 +0200
Subject: [PATCH] Handle ampersands in messages correctly, fixes #43

---
 harbour-fernschreiber.pro | 2 +-
 qml/js/functions.js       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/harbour-fernschreiber.pro b/harbour-fernschreiber.pro
index b96aa0b..a3056dc 100644
--- a/harbour-fernschreiber.pro
+++ b/harbour-fernschreiber.pro
@@ -58,7 +58,7 @@ TRANSLATIONS += translations/harbour-fernschreiber-de.ts \
                 translations/harbour-fernschreiber-zh_CN.ts
 
 # Use armv7hl for most devices and i486 for emulator and Jolla Tablet. Can most certainly be automated... ;)
-TARGET_ARCHITECTURE = i486
+TARGET_ARCHITECTURE = armv7hl
 
 INCLUDEPATH += $$PWD/tdlib/include
 DEPENDPATH += $$PWD/tdlib/include
diff --git a/qml/js/functions.js b/qml/js/functions.js
index 893d0f6..2c7ba43 100644
--- a/qml/js/functions.js
+++ b/qml/js/functions.js
@@ -124,6 +124,7 @@ function enhanceMessageText(formattedText) {
     var messageText = formattedText.text;
     messageText = messageText.replace("<", "&lt;");
     messageText = messageText.replace(">", "&gt;");
+    messageText = messageText.replace("&", "&amp;");
     var messageInsertions = [];
 
     for (var i = 0; i < formattedText.entities.length; i++) {