From 1a38777ceacfbb23a39ec466bd41cc5bbd2e0f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= Date: Fri, 14 Nov 2025 15:18:13 +0100 Subject: [PATCH 1/4] fix: Import sticker packs --- .../settings_emotes/settings_emotes.dart | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/lib/pages/settings_emotes/settings_emotes.dart b/lib/pages/settings_emotes/settings_emotes.dart index 98e06e96c..56a96ffc8 100644 --- a/lib/pages/settings_emotes/settings_emotes.dart +++ b/lib/pages/settings_emotes/settings_emotes.dart @@ -276,26 +276,16 @@ class EmotesSettingsController extends State { } Future importEmojiZip() async { - final result = await showFutureLoadingDialog( - context: context, - future: () async { - final result = await selectFiles( - context, - type: FileSelectorType.zip, - ); - - if (result.isEmpty) return null; - - final buffer = InputMemoryStream(await result.first.readAsBytes()); - - final archive = ZipDecoder().decodeStream(buffer); - - return archive; - }, + final result = await selectFiles( + context, + type: FileSelectorType.zip, ); - final archive = result.result; - if (archive == null) return; + if (result.isEmpty) return; + + final buffer = InputMemoryStream(await result.single.readAsBytes()); + + final archive = ZipDecoder().decodeStream(buffer); await showDialog( context: context, From b65279f9084874a4e76bbdeeb1897412e8ae0c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= Date: Fri, 14 Nov 2025 15:39:00 +0100 Subject: [PATCH 2/4] chore: Update changelog --- CHANGELOG.md | 2 ++ android/fastlane/metadata/android/en-US/changelogs/default.txt | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8837c0ae1..86437bc33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ major performance leak and introduces polls and threads. - feat: Implement polls (Christian Kußowski) - feat: Implement threads (krille-chan) - fix: Database corruption because notification tab isolate starts too late (Christian Kußowski) +- fix: Import sticker packs (Christian Kußowski) - refactor: Improved UIA support for OIDC and SSO (Christian Kußowski) - refactor: Invite users when upgrading private room (Christian Kußowski) - build: (deps): bump cross_file from 0.3.4+2 to 0.3.5 (dependabot[bot]) @@ -18,6 +19,7 @@ major performance leak and introduces polls and threads. - build: Switch back to stable web auth package (krille-chan) - build: Use matrix sdk 4.0.0 (Christian Kußowski) - build: Use secure storage from pub.dev again (krille-chan) +- chore: Remove Notification actions when using UnifiedPush (Christian Kußowski) - chore(translations): Added translation using Weblate (Uzbek) (bahrom04) - chore(translations): Translated using Weblate (Basque) (xabirequejo) - chore(translations): Translated using Weblate (Belarusian) (Alex Katon) diff --git a/android/fastlane/metadata/android/en-US/changelogs/default.txt b/android/fastlane/metadata/android/en-US/changelogs/default.txt index 28ba54f3e..01a335509 100644 --- a/android/fastlane/metadata/android/en-US/changelogs/default.txt +++ b/android/fastlane/metadata/android/en-US/changelogs/default.txt @@ -1,2 +1,3 @@ FluffyChat 2.3.0 fixes a possible database corruption bug, also fixes a -major performance leak and introduces polls and threads. \ No newline at end of file +major performance leak and introduces polls and threads. +Several other bugs have also been fixed including importing sticker packgs. \ No newline at end of file From 7d16329cb593f39feefd82ee8b9d4fde302d6727 Mon Sep 17 00:00:00 2001 From: Jana Date: Fri, 14 Nov 2025 15:38:00 +0100 Subject: [PATCH 3/4] chore(translations): Translated using Weblate (German) Currently translated at 100.0% (811 of 811 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ --- lib/l10n/intl_de.arb | 57 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb index 8e396e21a..2fcd3f041 100644 --- a/lib/l10n/intl_de.arb +++ b/lib/l10n/intl_de.arb @@ -3439,5 +3439,60 @@ "donate": "Spenden", "@donate": {}, "resume": "Fortsetzen", - "@resume": {} + "@resume": {}, + "startedAPoll": "{username} hat eine Umfrage gestartet.", + "@startedAPoll": { + "type": "String", + "placeholders": { + "username": { + "type": "String" + } + } + }, + "poll": "Umfrage", + "@poll": {}, + "startPoll": "Umfrage starten", + "@startPoll": {}, + "endPoll": "Umfrage beenden", + "@endPoll": {}, + "answersVisible": "Antworten sichtbar", + "@answersVisible": {}, + "answersHidden": "Antworten sind verborgen", + "@answersHidden": {}, + "pollQuestion": "Frage", + "@pollQuestion": {}, + "answerOption": "Antwortmöglichkeit", + "@answerOption": {}, + "addAnswerOption": "Antwortoption hinzufügen", + "@addAnswerOption": {}, + "allowMultipleAnswers": "Mehrere Antworten zulassen", + "@allowMultipleAnswers": {}, + "pollHasBeenEnded": "Umfrage ist beendet", + "@pollHasBeenEnded": {}, + "countVotes": "{count, plural, =1{Eine Stimme} other{{count} Stimmen}}", + "@countVotes": { + "type": "int", + "placeholders": { + "count": { + "type": "int" + } + } + }, + "answersWillBeVisibleWhenPollHasEnded": "Die Antworten werden nach Ende der Umfrage sichtbar sein", + "@answersWillBeVisibleWhenPollHasEnded": {}, + "replyInThread": "Im Thread antworten", + "@replyInThread": {}, + "countReplies": "{count, plural, =1{Eine Antwort} other{{count} Antworten}}", + "@countReplies": { + "type": "int", + "placeholders": { + "count": { + "type": "int" + } + } + }, + "thread": "Thread", + "@thread": {}, + "backToMainChat": "Zurück zum Hauptchat", + "@backToMainChat": {} } From 5b0d62e98414151e1fc02e331a72e58df83260ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Nov 2025 21:09:12 +0000 Subject: [PATCH 4/4] build: (deps): bump animations from 2.1.0 to 2.1.1 Bumps [animations](https://github.com/flutter/packages/tree/main/packages) from 2.1.0 to 2.1.1. - [Commits](https://github.com/flutter/packages/commits/animations-v2.1.1/packages) --- updated-dependencies: - dependency-name: animations dependency-version: 2.1.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pubspec.lock | 20 ++++++++++---------- pubspec.yaml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 2807f22b4..008946c3c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,10 +21,10 @@ packages: dependency: "direct main" description: name: animations - sha256: a8031b276f0a7986ac907195f10ca7cd04ecf2a8a566bd6dbe03018a9b02b427 + sha256: "18938cefd7dcc04e1ecac0db78973761a01e4bc2d6bfae0cfa596bfeac9e96ab" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" ansicolor: dependency: transitive description: @@ -1128,10 +1128,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" mgrs_dart: dependency: transitive description: @@ -1861,26 +1861,26 @@ packages: dependency: transitive description: name: test - sha256: "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb" + sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7" url: "https://pub.dev" source: hosted - version: "1.26.2" + version: "1.26.3" test_api: dependency: transitive description: name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.6" + version: "0.7.7" test_core: dependency: transitive description: name: test_core - sha256: "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a" + sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0" url: "https://pub.dev" source: hosted - version: "0.6.11" + version: "0.6.12" timezone: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index dfe931294..caf246af1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - animations: ^2.1.0 + animations: ^2.1.1 app_links: ^6.4.1 archive: ^4.0.7 async: ^2.11.0