lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-03 22:35:45 +02:00
Code Activity

misc: avoid dirty qrc urls

Browse source 
e.g. <a href="test" id="fuzzelement1">test</a> is invalid
and should not open qrc://components/test

Also fix editId on message edition and format in the reply row.

Change-Id: I570ddf18f6ba716e448e9fbadd558a4d04cdef1c
This commit is contained in:
Sébastien Blin 2023-01-04 13:53:21 -05:00
parent e842a44567
commit a05632e3f4
8 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/commoncomponents/DataTransferMessageDelegate.qml
View file

@ -202,7 +202,7 @@ Loader {
dataTransferItem.hoveredLink = canOpen ? dataTransferItem.hoveredLink = canOpen ?
("file:///" + Body) : "" ("file:///" + Body) : ""
if (dataTransferItem.hoveredLink) if (dataTransferItem.hoveredLink)
Qt.openUrlExternally(dataTransferItem.hoveredLink) Qt.openUrlExternally(new Url(dataTransferItem.hoveredLink))
} }
} }
} }

1
src/app/commoncomponents/ReplyToRow.qml
View file

@ -86,6 +86,7 @@ Item {
text: ReplyToBody text: ReplyToBody
elide: Text.ElideRight elide: Text.ElideRight
textFormat: Text.MarkdownText
color: UtilsAdapter.luma(bubble.color) ? color: UtilsAdapter.luma(bubble.color) ?
JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorLight :

2
src/app/commoncomponents/TextMessageDelegate.qml
View file

@ -83,7 +83,7 @@ SBSMessageBase {
renderType: Text.NativeRendering renderType: Text.NativeRendering
textFormat: Text.MarkdownText textFormat: Text.MarkdownText
onLinkHovered: root.hoveredLink = hoveredLink onLinkHovered: root.hoveredLink = hoveredLink
onLinkActivated: Qt.openUrlExternally(hoveredLink) onLinkActivated: Qt.openUrlExternally(new URL(hoveredLink))
readOnly: true readOnly: true
color: getBaseColor() color: getBaseColor()

4
src/app/mainview/components/AboutPopUp.qml
View file

@ -155,7 +155,7 @@ BaseModalDialog {
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
selectByMouse: true selectByMouse: true
readOnly: true readOnly: true
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(new Url(link))
TextMetrics { TextMetrics {
id: textMetricsjamiDeclarationHyperText id: textMetricsjamiDeclarationHyperText
@ -189,7 +189,7 @@ BaseModalDialog {
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
selectByMouse: true selectByMouse: true
readOnly: true readOnly: true
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(new Url(link))
TextMetrics { TextMetrics {
id: textMetricsjamiNoneWarrantyHyperText id: textMetricsjamiNoneWarrantyHyperText

1
src/app/mainview/components/EditContainer.qml
View file

@ -70,6 +70,7 @@ Rectangle {
} }
text: metrics.elidedText text: metrics.elidedText
textFormat: Text.MarkdownText
color: UtilsAdapter.luma(root.color) ? color: UtilsAdapter.luma(root.color) ?
JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorLight :
JamiTheme.chatviewTextColorDark JamiTheme.chatviewTextColorDark

2
src/app/mainview/components/FilePreview.qml
View file

@ -92,7 +92,7 @@ Component {
ctxMenu.y = mouse.y ctxMenu.y = mouse.y
ctxMenu.openMenu() ctxMenu.openMenu()
} else { } else {
Qt.openUrlExternally("file://" + Body) Qt.openUrlExternally(new Url("file://" + Body))
} }
} }
} }

1
src/app/messagesadapter.cpp
View file

@ -180,6 +180,7 @@ MessagesAdapter::editMessage(const QString& convId, const QString& newBody, cons
if (editId.isEmpty()) { if (editId.isEmpty()) {
return; return;
} }
set_editId("");
lrcInstance_->getCurrentConversationModel()->editMessage(convId, newBody, editId); lrcInstance_->getCurrentConversationModel()->editMessage(convId, newBody, editId);
} catch (...) { } catch (...) {
qDebug() << "Exception during message edition:" << messageId; qDebug() << "Exception during message edition:" << messageId;

2
src/app/settingsview/components/LogsView.qml
View file

@ -220,7 +220,7 @@ Window {
autoAccelerator: true autoAccelerator: true
onClicked: Qt.openUrlExternally( onClicked: Qt.openUrlExternally(
"https://jami.net/bugs-and-improvements/") new Url("https://jami.net/bugs-and-improvements/"))
} }
} }
} }