aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-10-20 22:01:04 +0200
committerChristian Schneppe <christian@pix-art.de>2018-10-20 22:01:04 +0200
commitb6d64f1f4338c6c8e0c3ed91983da6aa16024fe0 (patch)
tree7ef465be27da6f892262a716b59c49b8d25e14d5 /src/main/res
parentb2d98cbd131ca4b926a27886b3c911a992a17d3f (diff)
Do not insert text shared over XMPP uri when already drafting message
XMPP uris in the style of `xmpp:test@domain.tld?body=Something` can be used to directly share a message with a specific contact. Previously the text was always appended to the message currently in draft. The message was never send automatically. Essentially those links where treated like normal text share intents (for example when sharing a URL from the browser) but without the contact selection. There is a concern (CVE-2018-18467) that when this URI is invoked automatically and the user is currently drafting a long message to that particular contact the text could be inserted in the draft field (input box) without the user noticing. To circumvent that the text shared over XMPP uris that contain a particular contact is now appended only if the draft box is currently empty. Sharing text normally (**with** manual contact selection) is still treated the same; meaning the shared text will be appended to the current draft. This is intended behaviour to make the 'Hey I have this cool link here;' *open browser*, *share link* - secenario work.
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0016bb5d5..34c227331 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -834,5 +834,6 @@
<string name="delete_file_dialog_msg">Are you sure you want to delete this file?\n\n<b>Warning:</b> This will not delete copies of this file that are stored on other devices or servers. </string>
<string name="cancelled">cancelled</string>
<string name="remote_server_timeout">Remote server timeout</string>
+ <string name="already_drafting_message">You are already drafting a message.</string>
</resources>