From d380ada30629dd8890ffcfb1b387c53fc161ab34 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Thu, 7 Apr 2016 15:37:11 +0200 Subject: [PATCH] Escape quotes on translated strings when calling execJavaScriptFromString --- .../java/org/wordpress/android/editor/EditorFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java index d149212e7b1d..310411b55bad 100755 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java @@ -972,9 +972,9 @@ public void run() { // Set title and content placeholder text mWebView.execJavaScriptFromString("ZSSEditor.getField('zss_field_title').setPlaceholderText('" + - mTitlePlaceholder + "');"); + Utils.escapeQuotes(mTitlePlaceholder) + "');"); mWebView.execJavaScriptFromString("ZSSEditor.getField('zss_field_content').setPlaceholderText('" + - mContentPlaceholder + "');"); + Utils.escapeQuotes(mContentPlaceholder) + "');"); // Load title and content into ZSSEditor updateVisualEditorFields(); @@ -982,7 +982,7 @@ public void run() { // If there are images that are still in progress (because the editor exited before they completed), // set them to failed, so the user can restart them (otherwise they will stay stuck in 'uploading' mode) mWebView.execJavaScriptFromString("ZSSEditor.markAllUploadingMediaAsFailed('" - + getString(R.string.tap_to_try_again) + "');"); + + Utils.escapeQuotes(getString(R.string.tap_to_try_again)) + "');"); // Update the list of failed media uploads mWebView.execJavaScriptFromString("ZSSEditor.getFailedMedia();");