Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Krille/new notification actions #1382

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions lib/utils/background_push.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import 'package:matrix/matrix.dart';
import 'package:unifiedpush/unifiedpush.dart';
import 'package:unifiedpush_ui/unifiedpush_ui.dart';

import 'package:fluffychat/utils/notification_background_handler.dart';
import 'package:fluffychat/utils/push_helper.dart';
import 'package:fluffychat/widgets/fluffy_chat_app.dart';
import '../config/app_config.dart';
Expand Down Expand Up @@ -77,7 +78,12 @@ class BackgroundPush {
android: AndroidInitializationSettings('notifications_icon'),
iOS: DarwinInitializationSettings(),
),
onDidReceiveNotificationResponse: goToRoom,
onDidReceiveNotificationResponse: (response) => notificationTap(
response,
client: client,
router: FluffyChatApp.router,
),
onDidReceiveBackgroundNotificationResponse: notificationTapBackground,
);
Logs().v('Flutter Local Notifications initialized');
firebase?.setListeners(
Expand Down Expand Up @@ -275,7 +281,14 @@ class BackgroundPush {
return;
}
_wentToRoomOnStartup = true;
goToRoom(details.notificationResponse);
final response = details.notificationResponse;
if (response != null) {
notificationTap(
response,
client: client,
router: FluffyChatApp.router,
);
}
});
}

Expand Down Expand Up @@ -319,25 +332,6 @@ class BackgroundPush {
);
}

Future<void> goToRoom(NotificationResponse? response) async {
try {
final roomId = response?.payload;
Logs().v('[Push] Attempting to go to room $roomId...');
if (roomId == null) {
return;
}
await client.roomsLoading;
await client.accountDataLoading;
FluffyChatApp.router.go(
client.getRoomById(roomId)?.membership == Membership.invite
? '/rooms'
: '/rooms/$roomId',
);
} catch (e, s) {
Logs().e('[Push] Failed to open room', e, s);
}
}

Future<void> setupUp() async {
await UnifiedPushUi(matrix!.context, ["default"], UPFunctions())
.registerAppWithDialog();
Expand Down
88 changes: 88 additions & 0 deletions lib/utils/notification_background_handler.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import 'package:collection/collection.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import 'package:shared_preferences/shared_preferences.dart';

import 'package:fluffychat/utils/client_manager.dart';

@pragma('vm:entry-point')
void notificationTapBackground(
NotificationResponse notificationResponse,
) async {
Logs().i('Notification tap in background');
final client = (await ClientManager.getClients(
initialize: false,
store: await SharedPreferences.getInstance(),
))
.first;
await client.abortSync();
await client.init(
waitForFirstSync: false,
waitUntilLoadCompletedLoaded: false,
);
if (!client.isLogged()) {
throw Exception('Notification tab in background but not logged in!');
}
notificationTap(notificationResponse, client: client);
}

void notificationTap(
NotificationResponse notificationResponse, {
GoRouter? router,
required Client client,
}) async {
Logs().d(
'Notification action handler started',
notificationResponse.notificationResponseType.name,
);
switch (notificationResponse.notificationResponseType) {
case NotificationResponseType.selectedNotification:
final roomId = notificationResponse.payload;
if (roomId == null) return;

if (router == null) {
Logs().v('Ignore select notification action in background mode');
return;
}
Logs().v('Open room from notification tap', roomId);
await client.roomsLoading;
await client.accountDataLoading;
router.go(
client.getRoomById(roomId)?.membership == Membership.invite
? '/rooms'
: '/rooms/$roomId',
);
case NotificationResponseType.selectedNotificationAction:
final actionType = FluffyChatNotificationActions.values.singleWhereOrNull(
(action) => action.name == notificationResponse.actionId,
);
if (actionType == null) {
throw Exception('Selected notification with action but no action ID');
}
final roomId = notificationResponse.payload;
if (roomId == null) {
throw Exception('Selected notification with action but no payload');
}
final room = client.getRoomById(roomId);
if (room == null) {
throw Exception(
'Selected notification with action but unknown room $roomId',
);
}
switch (actionType) {
case FluffyChatNotificationActions.markAsRead:
await room.setReadMarker(room.lastEvent!.eventId);
case FluffyChatNotificationActions.reply:
final input = notificationResponse.input;
if (input == null || input.isEmpty) {
throw Exception(
'Selected notification with reply action but without input',
);
}
await room.sendTextEvent(input);
}
}
}

enum FluffyChatNotificationActions { markAsRead, reply }
12 changes: 12 additions & 0 deletions lib/utils/push_helper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/utils/client_download_content_extension.dart';
import 'package:fluffychat/utils/client_manager.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
import 'package:fluffychat/utils/notification_background_handler.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/utils/voip/callkeep_manager.dart';

Expand Down Expand Up @@ -274,6 +275,17 @@ Future<void> _tryPushHelper(
importance: Importance.high,
priority: Priority.max,
groupKey: event.room.spaceParents.firstOrNull?.roomId ?? 'rooms',
actions: <AndroidNotificationAction>[
AndroidNotificationAction(
FluffyChatNotificationActions.markAsRead.name,
l10n.markAsRead,
),
AndroidNotificationAction(
FluffyChatNotificationActions.reply.name,
l10n.reply,
inputs: [const AndroidNotificationActionInput()],
),
],
);
const iOSPlatformChannelSpecifics = DarwinNotificationDetails();
final platformChannelSpecifics = NotificationDetails(
Expand Down