From 3f27289fd80ca30a60c98e68cb6e7329f81d574b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 16 Sep 2021 15:29:58 -0400
Subject: [PATCH] messagesadapter: do not use .arg() for printing messages
This breaks messages with %Num inside. .arg() is useful for
l20n but here we don't care as the two arguments will always be
in the same order.
GitLab: #529
Change-Id: I018bdecdf51d30be887ab4a50ef54401f2f34235
---
src/messagesadapter.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/messagesadapter.cpp b/src/messagesadapter.cpp
index c03bbd5ab..ec68a5cea 100644
--- a/src/messagesadapter.cpp
+++ b/src/messagesadapter.cpp
@@ -400,9 +400,9 @@ MessagesAdapter::updateHistory(lrc::api::ConversationModel& conversationModel,
auto conversationId = lrcInstance_->get_selectedConvUid();
auto interactionsStr
= interactionsToJsonArrayObject(conversationModel, conversationId, interactions).toUtf8();
- QString s = QString::fromLatin1("updateHistory(%1, %2);")
- .arg(interactionsStr.constData())
- .arg(allLoaded);
+ QString s;
+ QTextStream out(&s);
+ out << "updateHistory(" << interactionsStr << ", " << (allLoaded? "true" : "false") << ");";
QMetaObject::invokeMethod(qmlObj_, "webViewRunJavaScript", Q_ARG(QVariant, s));
conversationModel.clearUnreadInteractions(conversationId);
}
--
GitLab