2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Notifications on web correctly managed when tab not focused

Browse source
This commit is contained in:
Christian Kußowski 2026-01-18 14:20:18 +01:00
commit a0aeab34ea
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
3 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pages/chat/chat.dart
View file

@ -523,9 +523,7 @@ class ChatController extends State<ChatPageWithRoom>
} }
// Do not send read markers when app is not in foreground // Do not send read markers when app is not in foreground
if (kIsWeb && !Matrix.of(context).webHasFocus) return; if (WidgetsBinding.instance.lifecycleState != AppLifecycleState.resumed) {
if (!kIsWeb &&
WidgetsBinding.instance.lifecycleState != AppLifecycleState.resumed) {
return; return;
} }

5
lib/widgets/local_notifications_extension.dart
View file

@ -13,7 +13,6 @@ import 'package:fluffychat/config/setting_keys.dart';
import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/utils/client_download_content_extension.dart'; import 'package:fluffychat/utils/client_download_content_extension.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.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/utils/push_helper.dart';
import 'package:fluffychat/widgets/fluffy_chat_app.dart'; import 'package:fluffychat/widgets/fluffy_chat_app.dart';
import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart';
@ -26,9 +25,7 @@ extension LocalNotificationsExtension on MatrixState {
void showLocalNotification(Event event) async { void showLocalNotification(Event event) async {
final roomId = event.room.id; final roomId = event.room.id;
if (activeRoomId == roomId) { if (activeRoomId == roomId) {
if (kIsWeb && webHasFocus) return; if (WidgetsBinding.instance.lifecycleState == AppLifecycleState.resumed) {
if (PlatformInfos.isDesktop &&
WidgetsBinding.instance.lifecycleState == AppLifecycleState.resumed) {
return; return;
} }
} }

2
lib/widgets/matrix.dart
View file

@ -197,8 +197,6 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
}); });
} }
bool webHasFocus = true;
String? get activeRoomId { String? get activeRoomId {
final route = FluffyChatApp.router.routeInformationProvider.value.uri.path; final route = FluffyChatApp.router.routeInformationProvider.value.uri.path;
if (!route.startsWith('/rooms/')) return null; if (!route.startsWith('/rooms/')) return null;