diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 1f0724ce..8b4c2b5b 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -763,7 +763,7 @@ class ChatController extends State ); } for (final event in selectedEvents) { - await event.remove(); + await event.cancelSend(); } setState(selectedEvents.clear); } catch (e, s) { @@ -813,7 +813,7 @@ class ChatController extends State ); } } else { - await event.remove(); + await event.cancelSend(); } }, ); diff --git a/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart b/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart index 8d62549c..939263fd 100644 --- a/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart +++ b/lib/pages/settings_multiple_emotes/settings_multiple_emotes_view.dart @@ -25,9 +25,9 @@ class MultipleEmotesSettingsView extends StatelessWidget { builder: (context, snapshot) { final packStateEvents = room.states['im.ponies.room_emotes']; // we need to manually convert the map using Map.of, otherwise assigning null will throw a type error. - final Map packs = packStateEvents != null - ? Map.of(packStateEvents) - : {}; + final packs = packStateEvents != null + ? Map.of(packStateEvents) + : {}; if (!packs.containsKey('')) { packs[''] = null; } diff --git a/lib/pages/user_bottom_sheet/user_bottom_sheet.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet.dart index 98ad0e1c..52791507 100644 --- a/lib/pages/user_bottom_sheet/user_bottom_sheet.dart +++ b/lib/pages/user_bottom_sheet/user_bottom_sheet.dart @@ -127,11 +127,12 @@ class UserBottomSheetController extends State { textFields: [DialogTextField(hintText: L10n.of(context)!.reason)], ); if (reason == null || reason.single.isEmpty) return; + final result = await showFutureLoadingDialog( context: context, future: () => Matrix.of(widget.outerContext).client.reportContent( - user.roomId!, - user.eventId, + user.room.id, + user.id, reason: reason.single, score: score, ), diff --git a/pubspec.lock b/pubspec.lock index bb8cc24c..e7830653 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1210,10 +1210,10 @@ packages: dependency: "direct main" description: name: matrix - sha256: "32c21a2ac2c221ce887b00a87f965bd8df1a3a4ba8794bbe86be8b56214051fb" + sha256: ff221de5ce4cc382147216026096700e47f5902983507decdb3b36087f558dcf url: "https://pub.dev" source: hosted - version: "0.28.1" + version: "0.29.0" meta: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 4befc500..41f14436 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -64,7 +64,7 @@ dependencies: keyboard_shortcuts: ^0.1.4 latlong2: ^0.9.1 linkify: ^5.0.0 - matrix: ^0.28.1 + matrix: ^0.29.0 native_imaging: ^0.1.0 package_info_plus: ^6.0.0 pasteboard: ^0.2.0