From 4dce996e69fdce4681fb2a6c03de6bfdd9578f03 Mon Sep 17 00:00:00 2001 From: iequidoo Date: Mon, 3 Jun 2024 15:31:44 -0300 Subject: [PATCH 1/2] feat: Rephrase CantDecryptOutgoingMsgs stock string --- src/stock_str.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stock_str.rs b/src/stock_str.rs index 2d7da10437..b4ae8fe56b 100644 --- a/src/stock_str.rs +++ b/src/stock_str.rs @@ -426,7 +426,7 @@ pub enum StockMessage { InvalidUnencryptedMail = 174, #[strum(props( - fallback = "⚠️ It seems you are using Delta Chat on multiple devices that cannot decrypt each other's outgoing messages. To fix this, on the older device use \"Settings / Add Second Device\" and follow the instructions." + fallback = "⚠️ Could not decrypt outgoing messages that may be from Delta Chat on your other device. If so, to fix this, on the older device use \"Settings / Add Second Device\" and follow the instructions." ))] CantDecryptOutgoingMsgs = 175, From 21c9c06798d789dd78fdf751e8479f185ee01577 Mon Sep 17 00:00:00 2001 From: iequidoo Date: Wed, 5 Jun 2024 22:25:59 -0300 Subject: [PATCH 2/2] feat(ffi): Add DC_STR_CANT_DECRYPT_OUTGOING_MSGS define --- deltachat-ffi/deltachat.h | 6 ++++++ node/constants.js | 1 + node/lib/constants.ts | 1 + 3 files changed, 8 insertions(+) diff --git a/deltachat-ffi/deltachat.h b/deltachat-ffi/deltachat.h index 7f41b6014b..659f089538 100644 --- a/deltachat-ffi/deltachat.h +++ b/deltachat-ffi/deltachat.h @@ -7339,6 +7339,12 @@ void dc_event_unref(dc_event_t* event); /// `%1$s` will be replaced by the provider's domain. #define DC_STR_INVALID_UNENCRYPTED_MAIL 174 +/// "⚠️ Could not decrypt outgoing messages that may be from Delta Chat on your other device. If so, to fix this, on the older device use \"Settings / Add Second Device\" and follow the instructions." +/// +/// Added to the device chat if could not decrypt a new outgoing message (i.e. not when fetching +/// existing messages). But no more than once a day. +#define DC_STR_CANT_DECRYPT_OUTGOING_MSGS 175 + /// "You reacted %1$s to '%2$s'" /// /// `%1$s` will be replaced by the reaction, usually an emoji diff --git a/node/constants.js b/node/constants.js index afdd5c99e7..9cc2137074 100644 --- a/node/constants.js +++ b/node/constants.js @@ -171,6 +171,7 @@ module.exports = { DC_STR_BROADCAST_LIST: 115, DC_STR_CANNOT_LOGIN: 60, DC_STR_CANTDECRYPT_MSG_BODY: 29, + DC_STR_CANT_DECRYPT_OUTGOING_MSGS: 175, DC_STR_CHAT_PROTECTION_DISABLED: 171, DC_STR_CHAT_PROTECTION_ENABLED: 170, DC_STR_CONFIGURATION_FAILED: 84, diff --git a/node/lib/constants.ts b/node/lib/constants.ts index 4689757b13..85d426c873 100644 --- a/node/lib/constants.ts +++ b/node/lib/constants.ts @@ -171,6 +171,7 @@ export enum C { DC_STR_BROADCAST_LIST = 115, DC_STR_CANNOT_LOGIN = 60, DC_STR_CANTDECRYPT_MSG_BODY = 29, + DC_STR_CANT_DECRYPT_OUTGOING_MSGS = 175, DC_STR_CHAT_PROTECTION_DISABLED = 171, DC_STR_CHAT_PROTECTION_ENABLED = 170, DC_STR_CONFIGURATION_FAILED = 84,