From 4f3629ccf4ec4288614ad28b497c32f2b14ae19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= Date: Wed, 12 Nov 2025 11:05:52 +0100 Subject: [PATCH] chore: Update matrix dart sdk --- lib/main.dart | 4 ++-- lib/pages/chat/events/message.dart | 10 ++++++---- lib/pages/homeserver_picker/homeserver_picker.dart | 2 +- pubspec.lock | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index b09375b8a..9f14baea1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,6 @@ import 'dart:isolate'; import 'dart:ui'; -import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/notification_background_handler.dart'; import 'package:flutter/material.dart'; import 'package:collection/collection.dart'; @@ -11,7 +9,9 @@ import 'package:flutter_vodozemac/flutter_vodozemac.dart' as vod; import 'package:matrix/matrix.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/utils/client_manager.dart'; +import 'package:fluffychat/utils/notification_background_handler.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'config/setting_keys.dart'; import 'utils/background_push.dart'; diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index c55b1109f..15bf5814b 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -498,10 +498,12 @@ class Message extends StatelessWidget { CrossAxisAlignment .start, children: [ - if (RelationshipTypes - .reply == - event - .relationshipType) + if (event + .inReplyToEventId( + includingFallback: + false, + ) != + null) FutureBuilder( future: event .getReplyEvent( diff --git a/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart index 8f5e86148..dd050612a 100644 --- a/lib/pages/homeserver_picker/homeserver_picker.dart +++ b/lib/pages/homeserver_picker/homeserver_picker.dart @@ -79,7 +79,7 @@ class HomeserverPickerController extends State { homeserver = Uri.https(homeserverInput, ''); } final client = await Matrix.of(context).getLoginClient(); - final (_, _, loginFlows) = await client.checkHomeserver(homeserver); + final (_, _, loginFlows, _) = await client.checkHomeserver(homeserver); this.loginFlows = loginFlows; if (supportsSso && !legacyPasswordLogin) { if (!PlatformInfos.isMobile) { diff --git a/pubspec.lock b/pubspec.lock index ae5014069..2d37aa008 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1121,7 +1121,7 @@ packages: description: path: "." ref: main - resolved-ref: "9e26e5087a5811bcba5384e377a1b09a26badb89" + resolved-ref: "420346e1034e6ebf7860332a16fa8c327af046db" url: "https://github.com/famedly/matrix-dart-sdk.git" source: git version: "3.0.2"