Skip to content

Commit 2f29a14

Browse files
fix(mobile): Device Notifications shows off until the relay holds a push token
The switch read device registration, which stays registered for Live Activities when no push token is available. It now reads notification readiness, and a change in readiness notifies subscribers. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 9a995aa commit 2f29a14

3 files changed

Lines changed: 28 additions & 7 deletions

File tree

‎apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import {
3737
registerLiveActivityPushToken,
3838
releaseAgentAwarenessRelayTokenProvider,
3939
setAgentAwarenessRelayTokenProvider,
40+
subscribeAgentAwarenessRegistrationStatus,
4041
updateAgentAwarenessRegistrationPreferences,
4142
type AgentAwarenessRegistrationError,
4243
} from "./remoteRegistration";
@@ -752,6 +753,15 @@ describe("makeRelayDeviceRegistrationRequest", () => {
752753
expect(agentAwarenessNotificationsReady()).toBe(false);
753754
expect(registrations).toMatchObject([{ preferences: { notificationsEnabled: true } }]);
754755
expect(registrations[0]).not.toHaveProperty("pushToken");
756+
757+
const onStatusChange = vi.fn();
758+
subscribeAgentAwarenessRegistrationStatus(onStatusChange);
759+
const listener = vi.mocked(Notifications.addPushTokenListener).mock.calls.at(-1)![0];
760+
listener({ type: "android", data: "fcm-token" } as never);
761+
yield* runBackgroundOperations();
762+
763+
expect(agentAwarenessNotificationsReady()).toBe(true);
764+
expect(onStatusChange).toHaveBeenCalled();
755765
}).pipe(
756766
Effect.provideService(FetchHttpClient.Fetch, globalThis.fetch),
757767
Effect.provide(layerRelayTest),

‎apps/mobile/src/features/agent-awareness/remoteRegistration.ts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,15 @@ export type AgentAwarenessRegistrationStatus = "unknown" | "pending" | "register
105105
let registrationStatus: AgentAwarenessRegistrationStatus = "unknown";
106106
const registrationStatusListeners = new Set<() => void>();
107107

108-
function setRegistrationStatus(next: AgentAwarenessRegistrationStatus): void {
109-
if (registrationStatus === next) {
108+
function setRegistrationStatus(
109+
next: AgentAwarenessRegistrationStatus,
110+
withPushToken = registeredWithPushToken,
111+
): void {
112+
if (registrationStatus === next && registeredWithPushToken === withPushToken) {
110113
return;
111114
}
112115
registrationStatus = next;
116+
registeredWithPushToken = withPushToken;
113117
for (const listener of registrationStatusListeners) {
114118
listener();
115119
}
@@ -423,8 +427,7 @@ const registerDeviceWithRelay = Effect.fn("remoteRegistration.registerDeviceWith
423427
persisted.signature === signature &&
424428
!needsAndroidReplay
425429
) {
426-
registeredWithPushToken = Boolean(payload.pushToken);
427-
setRegistrationStatus("registered");
430+
setRegistrationStatus("registered", Boolean(payload.pushToken));
428431
return;
429432
}
430433

@@ -440,8 +443,7 @@ const registerDeviceWithRelay = Effect.fn("remoteRegistration.registerDeviceWith
440443
return;
441444
}
442445
if (body.platform === "android") androidDeviceReplayedAt = yield* Clock.currentTimeMillis;
443-
registeredWithPushToken = Boolean(payload.pushToken);
444-
setRegistrationStatus("registered");
446+
setRegistrationStatus("registered", Boolean(payload.pushToken));
445447
yield* Effect.promise(() =>
446448
saveAgentAwarenessRegistrationRecord({
447449
identity,

‎apps/mobile/src/features/settings/SettingsNotificationsRouteScreen.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ function useDeviceRegistered(): boolean {
109109
return status === "registered";
110110
}
111111

112+
function useNotificationsReady(): boolean {
113+
return useSyncExternalStore(
114+
subscribeAgentAwarenessRegistrationStatus,
115+
agentAwarenessNotificationsReady,
116+
() => false,
117+
);
118+
}
119+
112120
export function SettingsNotificationsRouteScreen() {
113121
if (!hasCloudPublicConfig()) {
114122
return (
@@ -161,6 +169,7 @@ function ConfiguredSettingsNotificationsRouteScreen() {
161169
setLiveActivityOverride({ status, basis: liveActivityBasis });
162170
const liveActivityWriteInFlight = useRef(false);
163171
const deviceRegistered = useDeviceRegistered();
172+
const notificationsReady = useNotificationsReady();
164173
const liveActivitiesPreferenceEnabled = AsyncResult.isSuccess(preferencesResult)
165174
? preferencesResult.value.liveActivitiesEnabled !== false
166175
: true;
@@ -435,7 +444,7 @@ function ConfiguredSettingsNotificationsRouteScreen() {
435444
}
436445
subtitle={agentAwarenessSubtitle}
437446
value={
438-
agentAwarenessPushAvailable && notificationStatus === "enabled" && deviceRegistered
447+
agentAwarenessPushAvailable && notificationStatus === "enabled" && notificationsReady
439448
}
440449
onValueChange={handleDeviceNotificationsChange}
441450
/>

0 commit comments

Comments
 (0)