diff --git a/apps/android/app/src/main/java/ai/openclaw/android/node/NotificationsHandler.kt b/apps/android/app/src/main/java/ai/openclaw/android/node/NotificationsHandler.kt index a7d757d4d48..f2afb81fc5e 100644 --- a/apps/android/app/src/main/java/ai/openclaw/android/node/NotificationsHandler.kt +++ b/apps/android/app/src/main/java/ai/openclaw/android/node/NotificationsHandler.kt @@ -55,6 +55,11 @@ class NotificationsHandler private constructor( } suspend fun handleNotificationsActions(paramsJson: String?): GatewaySession.InvokeResult { + val snapshot = stateProvider.readSnapshot(appContext) + if (snapshot.enabled && !snapshot.connected) { + stateProvider.requestServiceRebind(appContext) + } + val params = parseParamsObject(paramsJson) ?: return GatewaySession.InvokeResult.error( code = "INVALID_REQUEST", diff --git a/apps/android/app/src/test/java/ai/openclaw/android/node/NotificationsHandlerTest.kt b/apps/android/app/src/test/java/ai/openclaw/android/node/NotificationsHandlerTest.kt index 256a7346911..26869cad9ee 100644 --- a/apps/android/app/src/test/java/ai/openclaw/android/node/NotificationsHandlerTest.kt +++ b/apps/android/app/src/test/java/ai/openclaw/android/node/NotificationsHandlerTest.kt @@ -167,6 +167,26 @@ class NotificationsHandlerTest { assertEquals(1, provider.actionRequests) } + @Test + fun notificationsActions_requestsRebindWhenEnabledButDisconnected() = + runTest { + val provider = + FakeNotificationsStateProvider( + DeviceNotificationSnapshot( + enabled = true, + connected = false, + notifications = listOf(sampleEntry("n5")), + ), + ) + val handler = NotificationsHandler.forTesting(appContext = appContext(), stateProvider = provider) + + val result = handler.handleNotificationsActions("""{"key":"n5","action":"open"}""") + + assertTrue(result.ok) + assertEquals(1, provider.rebindRequests) + assertEquals(1, provider.actionRequests) + } + @Test fun sanitizeNotificationTextReturnsNullForBlankInput() { assertNull(sanitizeNotificationText(null))