From c26a9149f54a8eb08748b6da5cb30616156bb052 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Fri, 20 Aug 2021 21:49:00 +0200 Subject: [PATCH] fix --- .../application/GExtensionStoreController.java | 6 +++--- .../extensionstore/application/WebUtils.java | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/GExtensionStoreController.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/GExtensionStoreController.java index 077c701..d725c7a 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/GExtensionStoreController.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/GExtensionStoreController.java @@ -187,11 +187,11 @@ public class GExtensionStoreController implements Initializable { webView.getEngine().executeScript(String.format("setHeading(\"%s\", \"%s\", \"%s\")", WebUtils.escapeHtmlNoBackslash(overview.header().iconUrl()), - WebUtils.escapeMessage(overview.header().title()), - WebUtils.escapeMessage(overview.header().description()) + WebUtils.escapeMessageAndQuotes(overview.header().title()), + WebUtils.escapeMessageAndQuotes(overview.header().description()) )); webView.getEngine().executeScript(String.format("setContentTitle(\"%s\")", - WebUtils.escapeMessage(overview.header().contentTitle()) + WebUtils.escapeMessageAndQuotes(overview.header().contentTitle()) )); }); } diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/WebUtils.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/WebUtils.java index c5bad15..7565b34 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/WebUtils.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/WebUtils.java @@ -66,6 +66,11 @@ public class WebUtils { .replace("\r", "
"); } + public static String escapeMessageAndQuotes(String text) { + text = escapeMessage(text); + return text.replace("\"", """); + } + public static void clearElement(Element node) { while (node.hasChildNodes()) node.removeChild(node.getFirstChild());