From f0f426a6479fa6a93cae50e05be318d8ff3f73e6 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Wed, 29 Jul 2026 12:06:19 -0400
Subject: [PATCH] improve matcher for encrypted media

---
 lib/controllers/attachment.dart | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/controllers/attachment.dart b/lib/controllers/attachment.dart
index 220b5b3..2a99ee5 100644
--- a/lib/controllers/attachment.dart
+++ b/lib/controllers/attachment.dart
@@ -17,18 +17,16 @@ class AttachmentController extends Notifier<(String, MessageContent?)?> {
     final filename = basename(file.path);
     state = (filename, null);
 
-    final room = ref.read(
-      RoomsController.provider.select((value) => value[roomId]),
+    final isEncrypted = ref.read(
+      RoomsController.provider.select(
+        (value) =>
+            value[roomId]?.state[EventType.encryption.type]?.isNotEmpty == true,
+      ),
     );
 
     final content = await ref
         .watch(ClientController.provider.notifier)
-        .uploadMedia(
-          .new(
-            path: file.path,
-            encrypt: room?.state[EventType.encryption.type]?.isNotEmpty == true,
-          ),
-        );
+        .uploadMedia(.new(path: file.path, encrypt: isEncrypted));
 
     state = (filename, content);
   }