From 0f62573b1cd0b88596d551d0d4224a5df629ac3b Mon Sep 17 00:00:00 2001 From: Guillaume ETHEVE Date: Sat, 7 Nov 2026 21:12:40 +0100 Subject: [PATCH] Filter notification lists and status icons by source preferences --- app/native/notification-icons.ios.ts | 9 ++++++-- app/native/notification-icons.ts | 18 ++++++++++++++-- app/ui/notification-filter.ts | 2 +- app/ui/notifications.ts | 16 +++++++------- docs/validation-notifications.md | 16 ++++++++++++-- tests/ios-notification-icons.test.cjs | 10 ++++++++- tests/notification-filter.test.cjs | 31 +++++++++++++++++++++++++++ 7 files changed, 86 insertions(+), 16 deletions(-) diff --git a/app/native/notification-icons.ios.ts b/app/native/notification-icons.ios.ts index 7f15e255..9ad94d38 100644 --- a/app/native/notification-icons.ios.ts +++ b/app/native/notification-icons.ios.ts @@ -2,7 +2,7 @@ import type { GrayImage } from '../graphics/image' import { pebbleIcon } from '../graphics/pebble-icons' import { AncsClient, ANCS_CONNECT_MESSAGE, type AncsState } from '../g2/ancs-client' import { notificationAppIcon, notificationCategoryIcon } from './notification-app-icons' -import { rememberNotificationSources } from './notification-sources' +import { rememberNotificationSources, shouldShowNotificationOnGlasses } from './notification-sources' import type { AndroidNotification } from './notification-types' export type { AndroidNotification, AndroidNotificationAction } from './notification-types' export type { NotificationIconsResult, NotificationIconResult, NotificationImageResult } from './notification-icons' @@ -24,6 +24,11 @@ export function onIosNotificationPopup(listener: (key: string) => void): () => v export function iosNotificationMessage(): string { return active?.statusMessage ?? ANCS_CONNECT_MESSAGE } export function iosNotificationState(): AncsState { return active?.state ?? 'disconnected' } export function readActiveNotifications(maxNotifications = 50) { return active?.read(maxNotifications) ?? [] } +export function readVisibleNotifications(maxNotifications = 50) { + return readActiveNotifications(ALL_NOTIFICATIONS) + .filter(notification => shouldShowNotificationOnGlasses(notification.packageName)) + .slice(0, Math.max(0, maxNotifications)) +} export function invokeNotificationAction(key: string, index: number): boolean { return active?.action(key,index) ?? false } export function dismissNotification(key: string): boolean { return active?.dismiss(key) ?? false } export function dismissAllNotifications(): boolean { @@ -54,7 +59,7 @@ function notificationIcon(notification: AndroidNotification): GrayImage { export function readActiveNotificationIcons(maxIcons: number, _allowStale: boolean) { // One icon per source, standing for its first notification. const sources = new Map() - for (const n of readActiveNotifications(ALL_NOTIFICATIONS)) if (!sources.has(n.packageName)) sources.set(n.packageName, n) + for (const n of readVisibleNotifications(ALL_NOTIFICATIONS)) if (!sources.has(n.packageName)) sources.set(n.packageName, n) const shown = Array.from(sources.values()).slice(0,Math.max(0,maxIcons)) return {icons: shown.map(notificationIcon),keys: shown.map(n => n.key),stale:false} } diff --git a/app/native/notification-icons.ts b/app/native/notification-icons.ts index 8cc0de8f..be8a3413 100644 --- a/app/native/notification-icons.ts +++ b/app/native/notification-icons.ts @@ -1,7 +1,7 @@ import { GrayImage } from "../graphics/image"; import { logCurrent, spanCurrent } from "./frame-timings"; import { toUint8Array } from "../util/array-util"; -import { rememberNotificationSources } from "./notification-sources"; +import { rememberNotificationSources, shouldShowNotificationOnGlasses } from "./notification-sources"; import { PHOTO_TONE, grayImageFromPacket } from "./image-files"; import { NOTIFICATION_ICON_SIZE } from "./notification-types"; @@ -21,6 +21,7 @@ const ICON_CACHE_MS = 60_000; let cachedIcons: GrayImage[] = []; let cachedKeys: string[] = []; +let cachedPackages = new Map(); let cachedAtMs = 0; const keyedIconCache = new Map(); const KEYED_ICON_CACHE_MAX = 128; @@ -95,6 +96,7 @@ export function readActiveNotificationIcons(maxIcons: number, allowStale: boolea keys.push(index < keyList.size() ? String(keyList.get(index)) : ""); } + cachedPackages = new Map(readActiveNotifications(ALL_NOTIFICATIONS).map(n => [n.key, n.packageName])); cachedIcons = icons; cachedKeys = keys; cachedAtMs = now; @@ -103,7 +105,12 @@ export function readActiveNotificationIcons(maxIcons: number, allowStale: boolea /** Copies of the first maxIcons cached icons, with their keys. */ function cachedIconsResult(maxIcons: number, stale: boolean): NotificationIconsResult { - return { icons: cachedIcons.slice(0, maxIcons).map(icon => icon.clone()), keys: cachedKeys.slice(0, maxIcons), stale }; + // Reapply preferences even to a warm/stale cache: toggles take effect immediately. + const indices = cachedKeys.map((_, index) => index).filter(index => { + const packageName = cachedPackages.get(cachedKeys[index]!); + return packageName !== undefined && shouldShowNotificationOnGlasses(packageName); + }).slice(0, maxIcons); + return { icons: indices.map(index => cachedIcons[index]!.clone()), keys: indices.map(index => cachedKeys[index]!), stale }; } export type NotificationIconResult = { @@ -318,6 +325,13 @@ export function readActiveNotifications(maxNotifications = 50): AndroidNotificat } } +/** Glasses display only; discover all sources and filter before the display limit. */ +export function readVisibleNotifications(maxNotifications = 50): AndroidNotification[] { + return readActiveNotifications(ALL_NOTIFICATIONS) + .filter(notification => shouldShowNotificationOnGlasses(notification.packageName)) + .slice(0, Math.max(0, maxNotifications)); +} + export function invokeNotificationAction(notificationKey: string, actionIndex: number): boolean { if (!global.isAndroid || !notificationKey) return false; invalidateIconCaches(); diff --git a/app/ui/notification-filter.ts b/app/ui/notification-filter.ts index 6864335f..f99751ed 100644 --- a/app/ui/notification-filter.ts +++ b/app/ui/notification-filter.ts @@ -50,7 +50,7 @@ export class NotificationFilterLayer implements Layer { this.menu = new MenuLayer("Notification filter", items, { x: 8, y: 8, width: width - 16, opaque: true, showBorder: false, - footer: "On = show popups on glasses", + footer: "On = show notifications on glasses", }).selectItem(Math.max(0, index)); } else { this.menu.setItems(items, index >= 0 ? index : undefined); diff --git a/app/ui/notifications.ts b/app/ui/notifications.ts index cf1fe2fc..43658ba3 100644 --- a/app/ui/notifications.ts +++ b/app/ui/notifications.ts @@ -8,7 +8,7 @@ import { ALL_NOTIFICATIONS, dismissNotification, invokeNotificationAction, - readActiveNotifications, + readVisibleNotifications, readNotificationCustomView, readNotificationIconByKey, readNotificationLargeIcon, @@ -141,7 +141,7 @@ export class NotificationsListLayer implements Layer { const image = new GrayImage(width, height, 0); const cardWidth = width - 2 * CARD_X; const cardTextWidth = cardWidth - CARD_TEXT_X - 14; - const notifications = readActiveNotifications(MAX_NOTIFICATIONS); + const notifications = readVisibleNotifications(MAX_NOTIFICATIONS); const selectedIndex = this.resolveSelectedIndex(notifications); const layouts = notifications.map((notification, index) => buildNotificationCardLayout(font, notification, index === selectedIndex, cardTextWidth), @@ -185,7 +185,7 @@ export class NotificationsListLayer implements Layer { } handleInput(event: InputEvent, ctx: LayerContext): void { - const notifications = readActiveNotifications(MAX_NOTIFICATIONS); + const notifications = readVisibleNotifications(MAX_NOTIFICATIONS); const selectedIndex = this.resolveSelectedIndex(notifications); if (event.type === "double-click") { // At the app's root this is intercepted by the yield wrapper; reached @@ -252,7 +252,7 @@ export class SingleNotificationLayer implements Layer { const font = getDefaultSmallFont(); const { width, height } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); - const notification = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey); + const notification = readVisibleNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey); if (!notification) { return this.closeUnavailableNotification(ctx, paintBelow); @@ -273,7 +273,7 @@ export class SingleNotificationLayer implements Layer { else await menu.handleInput(event); return; } - const notification = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey); + const notification = readVisibleNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey); if (!notification) { this.closeUnavailableNotification(ctx); return; @@ -297,7 +297,7 @@ export class SingleNotificationLayer implements Layer { this.close(ctx); } else if (item.kind === "action") { invokeNotificationAction(this.notificationKey, item.action.index); - if (!readActiveNotifications(ALL_NOTIFICATIONS).some((active) => active.key === this.notificationKey)) { + if (!readVisibleNotifications(ALL_NOTIFICATIONS).some((active) => active.key === this.notificationKey)) { this.closeUnavailableNotification(ctx); } } else if (item.kind === "dismiss") { @@ -310,7 +310,7 @@ export class SingleNotificationLayer implements Layer { menu: new Menu({ items: [ { label: "Cancel", run: (runCtx) => this.close(runCtx) }, - { label: "Turn off popups", run: (runCtx) => { + { label: "Hide on glasses", run: (runCtx) => { setNotificationSourceEnabled(notification, false); this.close(runCtx); } }, @@ -341,7 +341,7 @@ export class SingleNotificationLayer implements Layer { }; menu.paint(image, menuBox, ctx.stack.isFocused()); const top = menuBox.y + menuBox.height + CONFIRM_PROMPT_GAP; - const prompt = `Turn off notification popups from ${source.appName || source.packageName}? You can turn them back on in the Notifications app's Notification filter.`; + const prompt = `Hide notifications on glasses from ${source.appName || source.packageName}? You can turn them back on in the Notifications app's Notification filter.`; const lines = wrapText(font, prompt, width - 2 * CONFIRM_X); const maxLines = Math.max(1, Math.floor((height - top - 12) / lineStep(font))); for (let index = 0; index < Math.min(lines.length, maxLines); index++) { diff --git a/docs/validation-notifications.md b/docs/validation-notifications.md index 403bfbd5..a66b4c29 100644 --- a/docs/validation-notifications.md +++ b/docs/validation-notifications.md @@ -19,5 +19,17 @@ Hardware validation (pending; no glasses tested): 6. Restart and repeat notifications from enabled and disabled sources. Check that bulk actions and filtering never dismiss notifications on the phone. -Only popup delivery on glasses is filtered. The notification tray and phone -notification lifecycle retain their existing behavior. +The same source preferences now filter glasses popups, the Notifications list, +and the notification tray/status icons. Filtering happens before display limits; +source discovery and the phone notification lifecycle remain unfiltered. +Cached tray icons reapply the current preferences on each read, including stale +reads, so a changed toggle cannot leave a muted icon visible. + +Additional software coverage: Android list limits and warm/stale icon caches, +Disable all / re-enable without a new post, and iOS list/tray filtering. + +Additional hardware validation (pending): with mixed enabled/disabled sources, +check the list and status bar together. Toggle a source while its notification +is already active, then Disable all and Enable all. Verify immediate removal / +restoration without a new notification, including after restart, and verify +notifications remain available in the phone notification shade. diff --git a/tests/ios-notification-icons.test.cjs b/tests/ios-notification-icons.test.cjs index 009ed1cd..94a4bdfc 100644 --- a/tests/ios-notification-icons.test.cjs +++ b/tests/ios-notification-icons.test.cjs @@ -9,7 +9,7 @@ const generator = require('../scripts/generate-pebble-icons.cjs'); function setup(notifications) { const load = loader({}, { '../g2/ancs-client': { AncsClient: class {}, ANCS_CONNECT_MESSAGE: '' }, - './notification-sources': { rememberNotificationSources() {} }, + './notification-sources': { rememberNotificationSources() {}, shouldShowNotificationOnGlasses: packageName => packageName !== "muted" }, }); const icons = load('app/native/notification-icons.ios.ts'); icons.bindIosNotifications({ read: () => notifications }); @@ -106,3 +106,11 @@ test('the icon generator inverts Pebble art: black ink lights up, white fills hi const decoded = loader({}, { './pebble-icons-data': loader({}, {})(dataFile) })('app/graphics/pebble-icons.ts').pebbleIcon('probe'); assert.deepEqual([...decoded.pixels], [...pixels]); }); + + test('muted sources are hidden before list and icon limits without removing phone notifications', () => { + const notifications = [notification('hidden', 'muted', '0'), notification('shown', 'allowed', '0')]; + const { icons } = setup(notifications); + assert.deepEqual([...icons.readVisibleNotifications(1)].map(n => n.key), ['shown']); + assert.deepEqual([...icons.readActiveNotificationIcons(1, false).keys], ['shown']); + assert.equal(icons.readActiveNotifications(10).length, 2); + }); diff --git a/tests/notification-filter.test.cjs b/tests/notification-filter.test.cjs index e5a0d713..e623dd0d 100644 --- a/tests/notification-filter.test.cjs +++ b/tests/notification-filter.test.cjs @@ -70,6 +70,7 @@ function ui(fontSize = 12) { const native = { ALL_NOTIFICATIONS: 0x7fffffff, readActiveNotifications: () => { prefs.rememberNotificationSources(active); return active; }, + readVisibleNotifications: () => { prefs.rememberNotificationSources(active); return active.filter(n => prefs.shouldShowNotificationOnGlasses(n.packageName)); }, dismissNotification: () => { dismissals++; active = []; return true; }, readNotificationIconByKey: () => ({ icon: null, stale: false }), }; @@ -317,3 +318,33 @@ test('controller filters before waking or opening a popup, and still refreshes t elapse(); assert.equal(popups, 1); }); + +test('Android display filters before limits and reapplies preferences to cached tray icons', () => { + const prefs = store(); + const active = [{ ...mail, key: 'hidden' }, { packageName: 'allowed', appName: 'Allowed', key: 'shown' }]; + const file = ts.createSourceFile('icons.ts', source('app/native/notification-icons.ts'), ts.ScriptTarget.Latest, true); + const functions = file.statements.filter(node => ts.isFunctionDeclaration(node) && + ['readVisibleNotifications', 'cachedIconsResult'].includes(node.name?.text)).map(node => node.getText(file)); + const { readVisibleNotifications, cachedIconsResult } = evaluate(functions.join('\n') + '\nexport { cachedIconsResult };', null, { + ALL_NOTIFICATIONS: 0x7fffffff, + readActiveNotifications: () => { prefs.rememberNotificationSources(active); return active; }, + shouldShowNotificationOnGlasses: prefs.shouldShowNotificationOnGlasses, + cachedKeys: ['hidden', 'shown'], + cachedPackages: new Map(active.map(n => [n.key, n.packageName])), + cachedIcons: [{ clone: () => 'mail-icon' }, { clone: () => 'allowed-icon' }], + }); + prefs.setNotificationSourceEnabled(mail, false); + assert.deepEqual(Array.from(readVisibleNotifications(1), n => n.key), ['shown']); + for (const stale of [false, true]) { + const result = cachedIconsResult(1, stale); + assert.deepEqual(Array.from(result.keys), ['shown']); + assert.deepEqual(Array.from(result.icons), ['allowed-icon']); + assert.equal(result.stale, stale); + } + prefs.setAllNotificationSourcesEnabled(false); + assert.equal(cachedIconsResult(10, false).keys.length, 0); + assert.equal(readVisibleNotifications(50).length, 0); + prefs.setNotificationSourceEnabled(mail, true); + assert.deepEqual(Array.from(cachedIconsResult(1, false).keys), ['hidden']); + assert.equal(active.length, 2); +});