chore: extract last event (#80)

Author: Feichtmeier

lib/chat_master/view/chat_master_detail_page.dart

@@ -51,9 +51,9 @@ class _ChatMasterDetailPageState extends State<ChatMasterDetailPage> {
 
     registerStreamHandler(
       select: (AuthenticationModel m) => m.onUiaRequestStream,
-      handler: (context, newValue, cancel) {
+      handler: (context, newValue, cancel) async {
         if (newValue.hasData) {
-          uiaRequestHandler(
+          await uiaRequestHandler(
             uiaRequest: newValue.data!,
             context: context,
             rootNavigator: true,

lib/chat_master/view/chat_room_last_event.dart

@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:matrix/matrix.dart';
+
+import '../../common/event_x.dart';
+import '../../l10n/l10n.dart';
+
+class ChatRoomLastEvent extends StatelessWidget {
+  const ChatRoomLastEvent({required this.lastEvent, super.key});
+
+  final Event? lastEvent;
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder<String>(
+      key: ValueKey(
+        '${lastEvent?.eventId}_${lastEvent?.type}_${lastEvent?.redacted}}',
+      ),
+      future: lastEvent?.calcLocalizedBody(
+        const MatrixDefaultLocalizations(),
+        hideReply: true,
+        plaintextBody: true,
+        withSenderNamePrefix: true,
+      ),
+      initialData: lastEvent?.calcLocalizedBodyFallback(
+        const MatrixDefaultLocalizations(),
+        hideReply: true,
+        plaintextBody: true,
+        withSenderNamePrefix: true,
+      ),
+      builder: (context, snapshot) {
+        if (snapshot.hasError) {
+          return const Text('?', maxLines: 1);
+        }
+        if (lastEvent != null) {
+          if (lastEvent!.hideInTimeline(
+            showAvatarChanges: false,
+            showDisplayNameChanges: false,
+          )) {
+            return const Text('...', maxLines: 1);
+          }
+          if (snapshot.hasData) {
+            return Text(snapshot.data!, maxLines: 1);
+          }
+        }
+
+        return Text(context.l10n.emptyChat, maxLines: 1);
+      },
+    );
+  }
+}

lib/chat_master/view/chat_room_master_tile_subtitle.dart

@@ -3,9 +3,9 @@ import 'package:matrix/matrix.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../common/chat_model.dart';
-import '../../common/event_x.dart';
 import '../../common/view/build_context_x.dart';
 import '../../l10n/l10n.dart';
+import 'chat_room_last_event.dart';
 
 class ChatRoomMasterTileSubTitle extends StatelessWidget with WatchItMixin {
   const ChatRoomMasterTileSubTitle({super.key, required this.room});
@@ -41,46 +41,3 @@ class ChatRoomMasterTileSubTitle extends StatelessWidget with WatchItMixin {
     );
   }
 }
-
-class ChatRoomLastEvent extends StatelessWidget {
-  const ChatRoomLastEvent({required this.lastEvent, super.key});
-
-  final Event? lastEvent;
-
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder<String>(
-      key: ValueKey(
-        '${lastEvent?.eventId}_${lastEvent?.type}_${lastEvent?.redacted}}',
-      ),
-      future: lastEvent?.calcLocalizedBody(
-        const MatrixDefaultLocalizations(),
-        hideReply: true,
-        plaintextBody: true,
-        withSenderNamePrefix: true,
-      ),
-      initialData: lastEvent?.calcLocalizedBodyFallback(
-        const MatrixDefaultLocalizations(),
-        hideReply: true,
-        plaintextBody: true,
-        withSenderNamePrefix: true,
-      ),
-      builder: (context, snapshot) {
-        if (snapshot.hasError) {
-          return const Text('?', maxLines: 1);
-        }
-        if (lastEvent!.hideInTimeline(
-          showAvatarChanges: false,
-          showDisplayNameChanges: false,
-        )) {
-          return const Text('...', maxLines: 1);
-        }
-        if (snapshot.hasData && lastEvent != null) {
-          return Text(snapshot.data!, maxLines: 1);
-        }
-
-        return Text(context.l10n.emptyChat, maxLines: 1);
-      },
-    );
-  }
-}

lib/encryption/view/key_verification_dialog.dart

@@ -335,12 +335,14 @@ class KeyVerificationPageState extends State<KeyVerificationDialog> {
             child: Text(l10n.close),
             onPressed: () {
               Navigator.of(context, rootNavigator: false).pop();
-              Navigator.of(context).pushAndRemoveUntil(
-                MaterialPageRoute(
-                  builder: (_) => const CheckEncryptionSetupPage(),
-                ),
-                (route) => false,
-              );
+              if (!widget.verifyOther) {
+                Navigator.of(context).pushAndRemoveUntil(
+                  MaterialPageRoute(
+                    builder: (_) => const CheckEncryptionSetupPage(),
+                  ),
+                  (route) => false,
+                );
+              }
             },
           ),
         );

lib/settings/settings_model.dart

@@ -125,7 +125,10 @@ class SettingsModel extends SafeChangeNotifier {
       }
     };
     if (!context.mounted) return;
-    await KeyVerificationDialog(request: keyVerification).show(context);
+    await KeyVerificationDialog(
+      request: keyVerification,
+      verifyOther: true,
+    ).show(context);
   }
 
   bool _attachingAvatar = false;