From 384cd51222b9473a93176235fff6743c5694f958 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 21:13:51 +0000 Subject: [PATCH 1/6] build: (deps): bump dynamic_color from 1.7.0 to 1.8.1 Bumps [dynamic_color](https://github.com/material-foundation/flutter-packages/tree/main/packages) from 1.7.0 to 1.8.1. - [Commits](https://github.com/material-foundation/flutter-packages/commits/HEAD/packages) --- updated-dependencies: - dependency-name: dynamic_color dependency-version: 1.8.1 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 41295d4c5..1c2435d91 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -354,10 +354,10 @@ packages: dependency: "direct main" description: name: dynamic_color - sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d + sha256: "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c" url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.8.1" emoji_picker_flutter: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index f78c872d4..9ff7cd205 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: desktop_drop: ^0.6.1 desktop_notifications: ^0.6.3 device_info_plus: ^11.5.0 - dynamic_color: ^1.7.0 + dynamic_color: ^1.8.1 emoji_picker_flutter: ^4.3.0 emojis: ^0.9.9 file_picker: ^10.2.0 From f7e46b391ef3132d4faa67f2b941ab6a5353bd64 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sat, 2 Aug 2025 11:01:12 +0200 Subject: [PATCH 2/6] build: Set version in override-pull --- snap/snapcraft.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index dd8d407a8..3a2b24dcc 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -78,12 +78,12 @@ parts: after: [flutter-git] plugin: nil source: . + override-pull: | + craftctl default + craftctl set version="$(yq e '.version' pubspec.yaml | sed 's/\(.*\)+.*/\1/')" override-build: | # Workaround for Flutter build error: rm -rf build - - craftctl set version="$(yq e '.version' pubspec.yaml | sed 's/\(.*\)+.*/\1/')" - flutter build linux --release -v mkdir -p $CRAFT_PART_INSTALL/bin/ cp -r build/linux/*/release/bundle/* $CRAFT_PART_INSTALL/bin/ From 82a9c1e5221d1ff408fcf1ae05083e3023aded42 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sat, 2 Aug 2025 12:31:56 +0200 Subject: [PATCH 3/6] chore: Fix snapcraft build --- snap/snapcraft.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3a2b24dcc..9708e0f64 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,7 +1,7 @@ name: fluffychat title: FluffyChat base: core24 -adopt-info: fluffychat +version: 2.0.0 license: AGPL-3.0 summary: The cutest messenger in the Matrix network description: | @@ -78,12 +78,10 @@ parts: after: [flutter-git] plugin: nil source: . - override-pull: | - craftctl default - craftctl set version="$(yq e '.version' pubspec.yaml | sed 's/\(.*\)+.*/\1/')" override-build: | # Workaround for Flutter build error: rm -rf build + flutter build linux --release -v mkdir -p $CRAFT_PART_INSTALL/bin/ cp -r build/linux/*/release/bundle/* $CRAFT_PART_INSTALL/bin/ @@ -95,7 +93,6 @@ parts: - libpciaccess-dev build-snaps: - rustup - - yq stage-packages: - libsecret-1-0 - libjsoncpp25 From 1a838b26bd43d83e242ab0b470042deb5b4627ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 21:14:06 +0000 Subject: [PATCH 4/6] build: (deps): bump archive from 3.6.1 to 4.0.7 Bumps [archive](https://github.com/brendan-duncan/archive) from 3.6.1 to 4.0.7. - [Changelog](https://github.com/brendan-duncan/archive/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/archive/commits) --- updated-dependencies: - dependency-name: archive dependency-version: 4.0.7 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- lib/pages/settings_emotes/settings_emotes.dart | 6 ++---- pubspec.lock | 16 ++++++++++++---- pubspec.yaml | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/pages/settings_emotes/settings_emotes.dart b/lib/pages/settings_emotes/settings_emotes.dart index 40730d8e4..98e06e96c 100644 --- a/lib/pages/settings_emotes/settings_emotes.dart +++ b/lib/pages/settings_emotes/settings_emotes.dart @@ -286,9 +286,9 @@ class EmotesSettingsController extends State { if (result.isEmpty) return null; - final buffer = InputStream(await result.first.readAsBytes()); + final buffer = InputMemoryStream(await result.first.readAsBytes()); - final archive = ZipDecoder().decodeBuffer(buffer); + final archive = ZipDecoder().decodeStream(buffer); return archive; }, @@ -338,8 +338,6 @@ class EmotesSettingsController extends State { '${pack.pack.displayName ?? client.userID?.localpart ?? 'emotes'}.zip'; final output = ZipEncoder().encode(archive); - if (output == null) return; - MatrixFile( name: fileName, bytes: Uint8List.fromList(output), diff --git a/pubspec.lock b/pubspec.lock index b2c442328..161ae9c88 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -74,10 +74,10 @@ packages: dependency: "direct main" description: name: archive - sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd" url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "4.0.7" args: dependency: transitive description: @@ -947,10 +947,10 @@ packages: dependency: "direct main" description: name: image - sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928" url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.5.4" image_picker: dependency: "direct main" description: @@ -1468,6 +1468,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + posix: + dependency: transitive + description: + name: posix + sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61" + url: "https://pub.dev" + source: hosted + version: "6.0.3" pretty_qr_code: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index b7b50f89f..25dc46a5f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,7 @@ environment: dependencies: animations: ^2.0.11 app_links: ^6.3.3 - archive: ^3.4.10 + archive: ^4.0.7 async: ^2.11.0 badges: ^3.1.2 blurhash_dart: ^1.2.1 From 1503f893570592237fb3b03c47d44130e4e859fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Jul 2025 00:19:17 +0000 Subject: [PATCH 5/6] build: (deps): bump unifiedpush from 5.0.2 to 6.0.2 Bumps unifiedpush from 5.0.2 to 6.0.2. --- updated-dependencies: - dependency-name: unifiedpush dependency-version: 6.0.2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- android/app/build.gradle.kts | 16 +++++++++++++ android/app/src/main/AndroidManifest.xml | 14 ----------- .../fluffy/fluffychat/UnifiedPushService.kt | 23 ------------------- lib/utils/background_push.dart | 10 ++++---- pubspec.lock | 12 +++++----- pubspec.yaml | 2 +- 6 files changed, 29 insertions(+), 48 deletions(-) delete mode 100644 android/app/src/main/kotlin/chat/fluffy/fluffychat/UnifiedPushService.kt diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 12375cbae..bd06a98f7 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -16,6 +16,22 @@ dependencies { coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4") // For flutter_local_notifications // Workaround for: https://github.com/MaikuB/flutter_local_notifications/issues/2286 } + +// Workaround for https://pub.dev/packages/unifiedpush#the-build-fails-because-of-duplicate-classes +configurations.all { + // Use the latest version published: https://central.sonatype.com/artifact/com.google.crypto.tink/tink-android + val tink = "com.google.crypto.tink:tink-android:1.17.0" + // You can also use the library declaration catalog + // val tink = libs.google.tink + resolutionStrategy { + force(tink) + dependencySubstitution { + substitute(module("com.google.crypto.tink:tink")).using(module(tink)) + } + } +} + + android { namespace = "chat.fluffy.fluffychat" compileSdk = flutter.compileSdkVersion diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 179341983..167602f73 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -135,20 +135,6 @@ - - - - - - - - - - - - _upUnregistered(i), onUnregistered: _upUnregistered, onMessage: _onUpMessage, ); @@ -352,7 +352,8 @@ class BackgroundPush { .registerAppWithDialog(); } - Future _newUpEndpoint(String newEndpoint, String i) async { + Future _newUpEndpoint(PushEndpoint newPushEndpoint, String i) async { + final newEndpoint = newPushEndpoint.url; upAction = true; if (newEndpoint.isEmpty) { await _upUnregistered(i); @@ -412,7 +413,8 @@ class BackgroundPush { } } - Future _onUpMessage(Uint8List message, String i) async { + Future _onUpMessage(PushMessage pushMessage, String i) async { + final message = pushMessage.content; upAction = true; final data = Map.from( json.decode(utf8.decode(message))['notification'], @@ -446,7 +448,7 @@ class UPFunctions extends UnifiedPushFunctions { @override Future registerApp(String instance) async { - await UnifiedPush.registerApp(instance, features); + await UnifiedPush.register(instance: instance, features: features); } @override diff --git a/pubspec.lock b/pubspec.lock index 161ae9c88..df6893e54 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -2005,26 +2005,26 @@ packages: dependency: "direct main" description: name: unifiedpush - sha256: "6dbed5a6305ca33f1865c7a3d814ae39476b79a2d23ca76a5708f023f405730f" + sha256: "1418375efb580af9640de4eaf4209cb6481f9a48792648ced3051f30e67d9568" url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "6.0.2" unifiedpush_android: dependency: transitive description: name: unifiedpush_android - sha256: "7443dece0a850ae956514f809983eb2b39fc518c2c7d24dbfe817198bec89134" + sha256: "2f25db8eb2fc3183bf2e43db89fff20b2587adc1c361e1d1e06b223a0d45b50a" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "3.1.1" unifiedpush_platform_interface: dependency: transitive description: name: unifiedpush_platform_interface - sha256: dd588d78a8b2bfc10430e30035526e98caa543d0b7364a6344b5eb4815721c6d + sha256: bb49d2748211520e35e0374ab816faa8a2c635267e71909d334ad868d532eba5 url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "3.0.1" unifiedpush_ui: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 25dc46a5f..7761490b8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -80,7 +80,7 @@ dependencies: sqlcipher_flutter_libs: ^0.6.7 swipe_to_action: ^0.3.0 tor_detector_web: ^1.1.0 - unifiedpush: ^5.0.1 + unifiedpush: ^6.0.2 unifiedpush_ui: ^0.1.0 universal_html: ^2.2.4 url_launcher: ^6.3.2 From 8075089f8a282456507f0d3188a5b7c62b241e8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 21:14:01 +0000 Subject: [PATCH 6/6] build: (deps): bump flutter_foreground_task from 6.5.0 to 9.1.0 Bumps [flutter_foreground_task](https://github.com/Dev-hwang/flutter_foreground_task) from 6.5.0 to 9.1.0. - [Changelog](https://github.com/Dev-hwang/flutter_foreground_task/blob/master/CHANGELOG.md) - [Commits](https://github.com/Dev-hwang/flutter_foreground_task/commits) --- updated-dependencies: - dependency-name: flutter_foreground_task dependency-version: 9.1.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- lib/pages/dialer/dialer.dart | 4 +++- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/pages/dialer/dialer.dart b/lib/pages/dialer/dialer.dart index d14d5dfa7..8f314808b 100644 --- a/lib/pages/dialer/dialer.dart +++ b/lib/pages/dialer/dialer.dart @@ -299,7 +299,9 @@ class MyCallingPage extends State { L10n.of(widget.context).foregroundServiceRunning, ), iosNotificationOptions: const IOSNotificationOptions(), - foregroundTaskOptions: const ForegroundTaskOptions(), + foregroundTaskOptions: ForegroundTaskOptions( + eventAction: ForegroundTaskEventAction.nothing(), + ), ); FlutterForegroundTask.startService( notificationTitle: L10n.of(widget.context).screenSharingTitle, diff --git a/pubspec.lock b/pubspec.lock index df6893e54..6afab33c3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -500,10 +500,10 @@ packages: dependency: "direct main" description: name: flutter_foreground_task - sha256: "6cf10a27f5e344cd2ecad0752d3a5f4ec32846d82fda8753b3fe2480ebb832a3" + sha256: "9f1b25a81db95d7119d2c5cffc654048cbdd49d4056183e1beadc1a6a38f3e29" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "9.1.0" flutter_highlighter: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 7761490b8..397438af1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,7 +28,7 @@ dependencies: file_selector: ^1.0.3 flutter: sdk: flutter - flutter_foreground_task: ^6.1.3 + flutter_foreground_task: ^9.1.0 flutter_highlighter: ^0.1.1 flutter_linkify: ^6.0.0 flutter_local_notifications: ^19.4.0