From 35778ae4ae8bea336083e762d452105e8ffa034b Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Mon, 4 Feb 2019 15:26:44 -0800
Subject: [PATCH] Prevent Sending Blank Messages, fix htmlescape &amp; bug

---
 qml/overlays/ChatOverlay.qml     |   7 +++++--
 qml/utils.js                     |   3 ---
 qml/widgets/InplaceEditText.qmlc | Bin 6240 -> 0 bytes
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 qml/widgets/InplaceEditText.qmlc

diff --git a/qml/overlays/ChatOverlay.qml b/qml/overlays/ChatOverlay.qml
index ae36eb5..698a94a 100644
--- a/qml/overlays/ChatOverlay.qml
+++ b/qml/overlays/ChatOverlay.qml
@@ -226,8 +226,11 @@ ColumnLayout {
 				onClicked: {
 					if (txtMessage.text != "") {
 						txtHidden.text = restoreEmoji(txtMessage.text)
-						var msg = JSON.stringify({"o":1, "d":txtHidden.getText(0, txtHidden.text.length)})
-						gcd.sendMessage(msg, nextMessageID++)
+						var txt = txtHidden.getText(0, txtHidden.text.length).trim()
+						if (txt.length > 0) {
+							var msg = JSON.stringify({"o":1, "d":txtHidden.getText(0, txtHidden.text.length)})
+							gcd.sendMessage(msg, nextMessageID++)
+						}
 					}
 					txtMessage.text = ""
 				}
diff --git a/qml/utils.js b/qml/utils.js
index d246f2d..f045284 100644
--- a/qml/utils.js
+++ b/qml/utils.js
@@ -1,11 +1,8 @@
 .pragma library
 
 function htmlEscaped(str) {
-    str = str.replace(/&/g, "&amp;");
     str = str.replace(/</g, "&lt;");
     str = str.replace(/>/g, "&gt;");
-    str = str.replace(/"/g, "&quot;");
-    str = str.replace(/'/g, "&apos;");
     return str
 }
 
diff --git a/qml/widgets/InplaceEditText.qmlc b/qml/widgets/InplaceEditText.qmlc
deleted file mode 100644
index ef3ccb28bb2560d3199c497cd381344ac05f2bcc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6240
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