From 8cfc25a139a2932e7c6c92bcd698aa69b105dde3 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Mon, 24 Nov 2025 16:41:36 +0100 Subject: [PATCH 1/7] chore: Request keys for last room messages after bootstrap --- lib/pages/bootstrap/bootstrap_dialog.dart | 29 ++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart index e1cdca0b9..7d91593c0 100644 --- a/lib/pages/bootstrap/bootstrap_dialog.dart +++ b/lib/pages/bootstrap/bootstrap_dialog.dart @@ -89,8 +89,31 @@ class BootstrapDialogState extends State { _goBackAction(false); } - void _goBackAction(bool success) => - context.canPop() ? context.pop(success) : context.go('/rooms'); + void _goBackAction(bool success) { + if (success) _decryptLastEvents(); + + context.canPop() ? context.pop(success) : context.go('/rooms'); + } + + void _decryptLastEvents() async { + for (final room in client.rooms) { + final event = room.lastEvent; + if (event != null && + event.type == EventTypes.Encrypted && + event.messageType == MessageTypes.BadEncrypted && + event.content['can_request_session'] == true) { + final sessionId = event.content.tryGet('session_id'); + final senderKey = event.content.tryGet('sender_key'); + if (sessionId != null && senderKey != null) { + room.client.encryption?.keyManager.maybeAutoRequest( + room.id, + sessionId, + senderKey, + ); + } + } + } + } void _createBootstrap(bool wipe) async { await client.roomsLoading; @@ -536,7 +559,7 @@ class BootstrapDialogState extends State { ); buttons.add( ElevatedButton( - onPressed: () => _goBackAction(false), + onPressed: () => _goBackAction(true), child: Text(L10n.of(context).close), ), ); From 5ec7f95b8e91b4cced0e36cf80900f24a278f935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Sun, 23 Nov 2025 20:27:56 +0100 Subject: [PATCH 2/7] chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (823 of 823 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ --- lib/l10n/intl_et.arb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/l10n/intl_et.arb b/lib/l10n/intl_et.arb index ff21a3fdd..3e46045b3 100644 --- a/lib/l10n/intl_et.arb +++ b/lib/l10n/intl_et.arb @@ -3503,5 +3503,13 @@ "stickerPackName": "Kleepsupaki nimi", "@stickerPackName": {}, "attribution": "Autoriõigused", - "@attribution": {} + "@attribution": {}, + "skipChatBackup": "Jäta vestluse varundamine vahele", + "@skipChatBackup": {}, + "skipChatBackupWarning": "Kas oled kindel? Kui sa pole lülitanud sisse vestluste krüptovõtmete varundust, siis võid oma seadme vahetamisel kaotada ligipääsu oma senistele sõnumitele.", + "@skipChatBackupWarning": {}, + "loadingMessages": "Laadin sõnumeid", + "@loadingMessages": {}, + "setupChatBackup": "Võta kasutusele vestluste varundus", + "@setupChatBackup": {} } From 07f621c42050ece5e71f55ac7c2e30fb689dc536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aindri=C3=BA=20Mac=20Giolla=20Eoin?= Date: Mon, 24 Nov 2025 11:14:23 +0100 Subject: [PATCH 3/7] chore(translations): Translated using Weblate (Irish) Currently translated at 100.0% (823 of 823 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/ --- lib/l10n/intl_ga.arb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/l10n/intl_ga.arb b/lib/l10n/intl_ga.arb index 93aaf75ba..746bddad0 100644 --- a/lib/l10n/intl_ga.arb +++ b/lib/l10n/intl_ga.arb @@ -769,7 +769,7 @@ }, "chatHasBeenAddedToThisSpace": "Cuireadh comhrá leis an spás seo", "@chatHasBeenAddedToThisSpace": {}, - "chatBackupDescription": "Tá do sheanteachtaireachtaí slán le eochair athshlánaithe. Le do thoil déan cinnte nach gcaillfidh tú é.", + "chatBackupDescription": "Tá do theachtaireachtaí slán le heochair aisghabhála. Déan cinnte nach gcaillfidh tú í.", "@chatBackupDescription": { "type": "String", "placeholders": {} @@ -3508,5 +3508,13 @@ "stickerPackName": "Ainm an phacáiste greamán", "@stickerPackName": {}, "attribution": "Atribution", - "@attribution": {} + "@attribution": {}, + "skipChatBackup": "Seachain cúltaca comhrá", + "@skipChatBackup": {}, + "skipChatBackupWarning": "An bhfuil tú cinnte? Mura gcumasaíonn tú an cúltaca comhrá, d’fhéadfá rochtain ar do theachtaireachtaí a chailleadh má athraíonn tú do ghléas.", + "@skipChatBackupWarning": {}, + "loadingMessages": "Ag lódáil teachtaireachtaí", + "@loadingMessages": {}, + "setupChatBackup": "Socraigh cúltaca comhrá", + "@setupChatBackup": {} } From eb4ecff9bff40d9f08bfa8a8806959e78422aa66 Mon Sep 17 00:00:00 2001 From: Edgars Andersons Date: Mon, 24 Nov 2025 07:35:14 +0100 Subject: [PATCH 4/7] chore(translations): Translated using Weblate (Latvian) Currently translated at 98.6% (812 of 823 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ --- lib/l10n/intl_lv.arb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/l10n/intl_lv.arb b/lib/l10n/intl_lv.arb index 9be8f72d0..7bb91ec8b 100644 --- a/lib/l10n/intl_lv.arb +++ b/lib/l10n/intl_lv.arb @@ -2348,7 +2348,7 @@ } } }, - "chatBackupDescription": "Iepriekšējās ziņas ir aizsargātas ar atkopes atslēgu. Lūgums nodrošināt, ka tā netiek pazaudēta.", + "chatBackupDescription": "Ziņas ir aizsargātas ar atkopes atslēgu. Lūgums nodrošināt, ka tā netiek pazaudēta.", "@chatBackupDescription": { "type": "String", "placeholders": {} @@ -3486,5 +3486,13 @@ "stickerPackName": "Uzlīmju pakas nosaukums", "@stickerPackName": {}, "attribution": "Piedēvējums", - "@attribution": {} + "@attribution": {}, + "skipChatBackup": "Izlaist tērzēšanu rezerves kopēšanu", + "@skipChatBackup": {}, + "skipChatBackupWarning": "Vai tiešām? Bez tērzēšanu rezerves kopēšanas var tikt zaudēta piekļuve savām ziņām, kad tiks mainīta ierīce.", + "@skipChatBackupWarning": {}, + "loadingMessages": "Ielādē ziņas", + "@loadingMessages": {}, + "setupChatBackup": "Iestatīt tērzēšanu rezerves kopēšanu", + "@setupChatBackup": {} } From ef1cc391c2b7f1ea9ef064da4825e9f68f6ba45c Mon Sep 17 00:00:00 2001 From: Maftuna Vohidjonovna Date: Mon, 24 Nov 2025 08:14:43 +0100 Subject: [PATCH 5/7] chore(translations): Translated using Weblate (Uzbek) Currently translated at 98.2% (809 of 823 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uz/ --- lib/l10n/intl_uz.arb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/l10n/intl_uz.arb b/lib/l10n/intl_uz.arb index eacb617ec..30c69c1b1 100644 --- a/lib/l10n/intl_uz.arb +++ b/lib/l10n/intl_uz.arb @@ -2400,7 +2400,7 @@ "@messageType": {}, "sender": "Yuboruvchi", "@sender": {}, - "openGallery": "Ochiq galereya", + "openGallery": "Galereyani ochish", "@openGallery": {}, "removeFromSpace": "Guruhdan olib tashlash", "@removeFromSpace": {}, @@ -3168,7 +3168,7 @@ }, "appWantsToUseForLoginDescription": "Siz bu bilan ilova va veb-saytga siz haqingizdagi axborotni ulashishga ruxsat berasiz.", "@appWantsToUseForLoginDescription": {}, - "open": "Ochiq", + "open": "Ochish", "@open": {}, "waitingForServer": "Server kutilmoqda...", "@waitingForServer": {}, From fbe0345296ac376de59f202bbfbaaa66f2919519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=8E=8B=E5=8F=AB=E6=88=91=E6=9D=A5=E5=B7=A1?= =?UTF-8?q?=E5=B1=B1?= Date: Sun, 23 Nov 2025 16:01:08 +0100 Subject: [PATCH 6/7] chore(translations): Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (823 of 823 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ --- lib/l10n/intl_zh.arb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb index 9c3e71744..7407a7296 100644 --- a/lib/l10n/intl_zh.arb +++ b/lib/l10n/intl_zh.arb @@ -362,7 +362,7 @@ "type": "String", "placeholders": {} }, - "chatBackupDescription": "你的旧消息受恢复密钥保护。请确保你不会丢失它。", + "chatBackupDescription": "你的消息受恢复密钥保护。请确保你不会丢失它。", "@chatBackupDescription": { "type": "String", "placeholders": {} @@ -3503,5 +3503,13 @@ "stickerPackName": "贴纸包名", "@stickerPackName": {}, "attribution": "作者", - "@attribution": {} + "@attribution": {}, + "skipChatBackup": "跳过聊天备份", + "@skipChatBackup": {}, + "skipChatBackupWarning": "确定吗？不开启聊天备份，如果切换设备可能无法访问消息。", + "@skipChatBackupWarning": {}, + "loadingMessages": "加载消息中", + "@loadingMessages": {}, + "setupChatBackup": "设置聊天备份", + "@setupChatBackup": {} } From b0e94c77370495cc4cd1fdeaa42b19c9f849311f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 21:21:15 +0000 Subject: [PATCH 7/7] build: (deps): bump emoji_picker_flutter from 4.3.0 to 4.4.0 Bumps [emoji_picker_flutter](https://github.com/Fintasys/emoji_picker_flutter) from 4.3.0 to 4.4.0. - [Release notes](https://github.com/Fintasys/emoji_picker_flutter/releases) - [Changelog](https://github.com/Fintasys/emoji_picker_flutter/blob/master/CHANGELOG.md) - [Commits](https://github.com/Fintasys/emoji_picker_flutter/compare/4.3.0...v4.4.0) --- updated-dependencies: - dependency-name: emoji_picker_flutter dependency-version: 4.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 19d6e5fc4..1f5d5be4a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -357,10 +357,10 @@ packages: dependency: "direct main" description: name: emoji_picker_flutter - sha256: "9a44c102079891ea5877f78c70f2e3c6e9df7b7fe0a01757d31f1046eeaa016d" + sha256: "984d3e9b9cf3175df9a868ce4a2d9611491e80e5d3b8e2b1e8991a4998972885" url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.4.0" fake_async: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b5264275e..9750b6949 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: desktop_notifications: ^0.6.3 device_info_plus: ^12.2.0 dynamic_color: ^1.8.1 - emoji_picker_flutter: ^4.3.0 + emoji_picker_flutter: ^4.4.0 file_picker: ^10.3.7 file_selector: ^1.1.0 flutter: