Show decrypted notification bodies and authenticated sender avatars.
Wait for E2EE cleartext before building tray text, and post Android notifications natively so dynamic avatars fetched with secure media auth can appear as large icons.
This commit is contained in:
@@ -64,6 +64,16 @@ interface MatrixBackgroundSyncPlugin {
|
||||
{ groupId: string; groupName: string; roomName: string; kind: string }
|
||||
>;
|
||||
}): Promise<{ success: boolean }>;
|
||||
/** Post a message notification with optional avatar (base64) from the JS layer. */
|
||||
showNotification(options: {
|
||||
title: string;
|
||||
body: string;
|
||||
roomId: string;
|
||||
groupId: string;
|
||||
groupName: string;
|
||||
kind: string;
|
||||
largeIconBase64?: string;
|
||||
}): Promise<{ shown: boolean }>;
|
||||
addListener(
|
||||
eventName: 'unifiedPushNewEndpoint',
|
||||
listenerFunc: (event: UnifiedPushEndpointEvent) => void
|
||||
@@ -564,3 +574,27 @@ export const syncNotificationGroupMap = async (
|
||||
console.warn('[BackgroundSync] setNotificationGroups failed:', err);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Posts a native tray notification (supports dynamic/authenticated avatar icons).
|
||||
* Prefer this over Capacitor LocalNotifications on Android.
|
||||
*/
|
||||
export const showNativeNotification = async (options: {
|
||||
title: string;
|
||||
body: string;
|
||||
roomId: string;
|
||||
groupId: string;
|
||||
groupName: string;
|
||||
kind: string;
|
||||
largeIconBase64?: string;
|
||||
}): Promise<boolean> => {
|
||||
if (!isBackgroundSyncSupported()) return false;
|
||||
|
||||
try {
|
||||
await MatrixBackgroundSync.showNotification(options);
|
||||
return true;
|
||||
} catch (err) {
|
||||
console.warn('[BackgroundSync] showNotification failed:', err);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -632,12 +632,13 @@ export const sendNotification = async (options: {
|
||||
title: string;
|
||||
body: string;
|
||||
icon?: string;
|
||||
iconBase64?: string;
|
||||
path?: string;
|
||||
roomId?: string;
|
||||
group?: NotificationGroupInfo;
|
||||
onClick?: () => void;
|
||||
}): Promise<void> => {
|
||||
const { title, body, icon, path, roomId, group, onClick } = options;
|
||||
const { title, body, icon, iconBase64, path, roomId, group, onClick } = options;
|
||||
const extra = {
|
||||
...(path ? { path } : {}),
|
||||
...(roomId ? { roomId } : {}),
|
||||
@@ -693,6 +694,7 @@ export const sendNotification = async (options: {
|
||||
// Use the channel on Android
|
||||
channelId: isAndroid() ? channelId : undefined,
|
||||
group: groupId,
|
||||
icon,
|
||||
// Store path/roomId in extra data for tap handling + clear-on-read
|
||||
extra: hasExtra ? extra : undefined,
|
||||
});
|
||||
@@ -716,6 +718,26 @@ export const sendNotification = async (options: {
|
||||
}
|
||||
|
||||
if (isCapacitorNative()) {
|
||||
// Prefer native NotificationManager so we can set dynamic/authenticated avatars.
|
||||
// Capacitor LocalNotifications only supports drawable resource largeIcon names.
|
||||
if (roomId && groupId && groupName && group) {
|
||||
try {
|
||||
const { showNativeNotification } = await import('./backgroundSync');
|
||||
const shown = await showNativeNotification({
|
||||
title,
|
||||
body,
|
||||
roomId,
|
||||
groupId,
|
||||
groupName,
|
||||
kind: group.kind,
|
||||
largeIconBase64: iconBase64,
|
||||
});
|
||||
if (shown) return;
|
||||
} catch (err) {
|
||||
console.warn('Native showNotification failed, falling back to LocalNotifications:', err);
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
const { LocalNotifications } = await import('@capacitor/local-notifications');
|
||||
let perm = await LocalNotifications.checkPermissions();
|
||||
|
||||
Reference in New Issue
Block a user