From a0aeab34ea146cbd14bcb543cdf092292ce98aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= Date: Sun, 18 Jan 2026 14:20:18 +0100 Subject: [PATCH] fix: Notifications on web correctly managed when tab not focused --- lib/pages/chat/chat.dart | 4 +--- lib/widgets/local_notifications_extension.dart | 5 +---- lib/widgets/matrix.dart | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 1404666ba..a2d7fd218 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -523,9 +523,7 @@ class ChatController extends State } // Do not send read markers when app is not in foreground - if (kIsWeb && !Matrix.of(context).webHasFocus) return; - if (!kIsWeb && - WidgetsBinding.instance.lifecycleState != AppLifecycleState.resumed) { + if (WidgetsBinding.instance.lifecycleState != AppLifecycleState.resumed) { return; } diff --git a/lib/widgets/local_notifications_extension.dart b/lib/widgets/local_notifications_extension.dart index 62b295c12..f650d95cf 100644 --- a/lib/widgets/local_notifications_extension.dart +++ b/lib/widgets/local_notifications_extension.dart @@ -13,7 +13,6 @@ import 'package:fluffychat/config/setting_keys.dart'; import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/utils/client_download_content_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; -import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/push_helper.dart'; import 'package:fluffychat/widgets/fluffy_chat_app.dart'; import 'package:fluffychat/widgets/matrix.dart'; @@ -26,9 +25,7 @@ extension LocalNotificationsExtension on MatrixState { void showLocalNotification(Event event) async { final roomId = event.room.id; if (activeRoomId == roomId) { - if (kIsWeb && webHasFocus) return; - if (PlatformInfos.isDesktop && - WidgetsBinding.instance.lifecycleState == AppLifecycleState.resumed) { + if (WidgetsBinding.instance.lifecycleState == AppLifecycleState.resumed) { return; } } diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index dbbee270e..fb67822c4 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -197,8 +197,6 @@ class MatrixState extends State with WidgetsBindingObserver { }); } - bool webHasFocus = true; - String? get activeRoomId { final route = FluffyChatApp.router.routeInformationProvider.value.uri.path; if (!route.startsWith('/rooms/')) return null;