GitLab
/
fluffychat
mirror of https://gitlab.com/famedly/fluffychat.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Provider in user bottom sheet

This commit is contained in:
Christian Pauly 2021-01-17 09:13:47 +01:00
parent dda092522e
commit 48d6fbd4c8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/components/user_bottom_sheet.dart
View File

@ -12,7 +12,6 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
import '../utils/presence_extension.dart'; import '../utils/presence_extension.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'matrix.dart';
import 'dialogs/key_verification_dialog.dart'; import 'dialogs/key_verification_dialog.dart';
class UserBottomSheet extends StatelessWidget { class UserBottomSheet extends StatelessWidget {
@ -81,14 +80,14 @@ class UserBottomSheet extends StatelessWidget {
} }
void _verifyAction(BuildContext context) async { void _verifyAction(BuildContext context) async {
final client = Matrix.of(context).client; final client = user.room.client;
final req = await client.userDeviceKeys[user.id].startVerification(); final req = await client.userDeviceKeys[user.id].startVerification();
await KeyVerificationDialog(request: req).show(context); await KeyVerificationDialog(request: req).show(context);
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final client = Matrix.of(context).client; final client = user.room.client;
final presence = client.presences[user.id]; final presence = client.presences[user.id];
final verificationStatus = client.userDeviceKeys[user.id]?.verified; final verificationStatus = client.userDeviceKeys[user.id]?.verified;
var items = <PopupMenuEntry<String>>[]; var items = <PopupMenuEntry<String>>[];
@ -103,8 +102,7 @@ class UserBottomSheet extends StatelessWidget {
value: 'mention'), value: 'mention'),
); );
} }
if (user.id != Matrix.of(context).client.userID && if (user.id != user.room.client.userID && !user.room.isDirectChat) {
!user.room.isDirectChat) {
items.add( items.add(
PopupMenuItem( PopupMenuItem(
child: _TextWithIcon( child: _TextWithIcon(
@ -187,7 +185,7 @@ class UserBottomSheet extends StatelessWidget {
? _verifyAction(context) ? _verifyAction(context)
: null, : null,
), ),
if (user.id != Matrix.of(context).client.userID) if (user.id != user.room.client.userID)
PopupMenuButton( PopupMenuButton(
itemBuilder: (_) => items, itemBuilder: (_) => items,
onSelected: (action) => onSelected: (action) =>