Introduce FrontendTarget and use it instead of WebViewActivity by TimoPtr · Pull Request #7087 · home-assistant/android

TimoPtr · 2026-06-24T14:57:29Z

Summary

The support for the deep link more-info was not complete it was missing the fallback case for old server, in order to make it right I've decided to introduce the FrontendTarget sealed interface. I've also replace most of the call to WebViewActivity.newInstance it only remains one usage in ManageShortcutsViewModel we need to migrate to LinkActivity #7086.

I've also made sure that the given parameter cannot extend more than just the entityID in the URL or JS evaluation.

Checklist

New or updated tests have been added to cover the changes following the testing guidelines.
The code follows the project's code style and best_practices.
The changes have been thoroughly tested, and edge cases have been considered.
Changes are backward compatible whenever feasible. Any breaking changes are documented in the changelog for users and/or in the code for developers depending on the relevance.

Copilot

Pull request overview

This PR introduces a typed FrontendTarget destination model to replace raw/nullable “path” usage across launch/navigation flows, and completes more-info deep link handling by supporting the HA 2025.6+ query parameter with a JavaScript fallback for older servers. It also migrates many callers away from WebViewActivity.newInstance toward LaunchActivity-based intents.

Changes:

Added FrontendTarget sealed interface and updated LaunchActivity / FrontendRoute / URL resolution APIs to use it.
Implemented EntityMoreInfo handling with HA-version gating: URL query param on 2025.6+, JS hass-more-info dispatch fallback otherwise.
Updated multiple entry points (widgets, notifications, controls, settings, link handling) and expanded unit test coverage.

Reviewed changes

Copilot reviewed 30 out of 30 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
app/src/test/kotlin/io/homeassistant/companion/android/launch/link/LinkViewModelTest.kt	Uses main dispatcher JUnit5 extension for coroutine correctness
app/src/test/kotlin/io/homeassistant/companion/android/launch/LaunchViewModelTest.kt	Updates expected routes to use `FrontendTarget`
app/src/test/kotlin/io/homeassistant/companion/android/frontend/WebViewActionTest.kt	Adds coverage for `OpenMoreInfo` JS generation and escaping
app/src/test/kotlin/io/homeassistant/companion/android/frontend/url/FrontendUrlManagerTest.kt	Updates API to `target` and adds HA-version more-info tests
app/src/test/kotlin/io/homeassistant/companion/android/frontend/navigation/FrontendTargetTest.kt	New tests for raw-path parsing/round-tripping
app/src/test/kotlin/io/homeassistant/companion/android/frontend/FrontendViewModelTest.kt	Updates URL manager mocks + adds tests for JS more-info fallback behavior
app/src/main/kotlin/io/homeassistant/companion/android/widgets/camera/CameraWidget.kt	Migrates widget tap intent to `LaunchActivity` via `FrontendTarget`
app/src/main/kotlin/io/homeassistant/companion/android/webview/WebViewActivity.kt	Deprecates `newInstance` to steer callers to `LaunchActivity`
app/src/main/kotlin/io/homeassistant/companion/android/websocket/WebsocketManager.kt	Uses `LaunchActivity` instead of `WebViewActivity` for notification intent
app/src/main/kotlin/io/homeassistant/companion/android/util/compose/GlanceExt.kt	Switches glance action to build `LaunchActivity` intent for navigation
app/src/main/kotlin/io/homeassistant/companion/android/settings/shortcuts/views/ManageShortcutsView.kt	Uses `FrontendTarget` parsing/serialization for shortcut entity selection
app/src/main/kotlin/io/homeassistant/companion/android/settings/SettingsFragment.kt	Uses `FrontendTarget.Default` intent for “activate server” CTA
app/src/main/kotlin/io/homeassistant/companion/android/settings/server/ServerSettingsFragment.kt	Uses `FrontendTarget.Default` intent for “activate server” preference
app/src/main/kotlin/io/homeassistant/companion/android/qs/TilePreferenceActivity.kt	Routes QS tile setup intent to entity more-info via `FrontendTarget`
app/src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt	Migrates notification click routing to `FrontendTarget` + `LaunchActivity`
app/src/main/kotlin/io/homeassistant/companion/android/launch/link/LinkActivity.kt	Converts raw path deep link to `FrontendTarget` before launching
app/src/main/kotlin/io/homeassistant/companion/android/launch/LaunchViewModel.kt	Switches deep link connect/navigation pipeline to `FrontendTarget`
app/src/main/kotlin/io/homeassistant/companion/android/launch/LaunchActivityExt.kt	Replaces string-path launcher helpers with `FrontendTarget` variants
app/src/main/kotlin/io/homeassistant/companion/android/launch/LaunchActivity.kt	Updates `DeepLink.NavigateTo` to carry a `FrontendTarget`
app/src/main/kotlin/io/homeassistant/companion/android/frontend/WebViewAction.kt	Adds `OpenMoreInfo` action for older-server fallback
app/src/main/kotlin/io/homeassistant/companion/android/frontend/url/UrlLoadResult.kt	Extends `Success` with `moreInfoEntityId` for JS fallback signaling
app/src/main/kotlin/io/homeassistant/companion/android/frontend/url/FrontendUrlManager.kt	Introduces `target` API + HA-version gated more-info URL building
app/src/main/kotlin/io/homeassistant/companion/android/frontend/navigation/FrontendTarget.kt	New typed destination model + raw-path mapping helpers
app/src/main/kotlin/io/homeassistant/companion/android/frontend/navigation/FrontendNavigation.kt	Stores route as raw path (perf) but exposes typed `target`
app/src/main/kotlin/io/homeassistant/companion/android/frontend/FrontendViewState.kt	Replaces path with `FrontendTarget` in view states
app/src/main/kotlin/io/homeassistant/companion/android/frontend/FrontendViewModel.kt	Tracks pending JS more-info fallback and emits `OpenMoreInfo` on page finish
app/src/main/kotlin/io/homeassistant/companion/android/controls/HaControlsPanelActivity.kt	Removes `WebViewActivity` path and always routes via `LaunchActivity` + `FrontendTarget`
app/src/main/kotlin/io/homeassistant/companion/android/controls/HaControl.kt	Updates control PendingIntent to use `LaunchActivity` + `EntityMoreInfo` target
app/src/main/kotlin/io/homeassistant/companion/android/assist/AssistActivity.kt	Migrates internal navigation to use `FrontendTarget.Path` via launcher helper

TimoPtr · 2026-06-30T14:23:54Z

+            // Only consume the target when a URL was actually loaded with it
            if (urlState is UrlState.HasUrl) {
-                pathConsumed = true
+                targetConsumed = true
            }


I think this is already the behavior we have today.

TimoPtr · 2026-06-30T14:26:08Z

+        private fun moreInfoScript(entityId: String): String {
+            val entityIdJson = Json.encodeToString(entityId)
+            return """document.querySelector("home-assistant")""" +
+                """.dispatchEvent(new CustomEvent("hass-more-info", { detail: { entityId: $entityIdJson }}))"""
+        }


@jpelgrom wdyt?

It's a fallback and has been pretty reliable as far as I'm aware, so I wouldn't change it now. It is only a JS error you'd get, not an app crash, right?

            is UrlLoadResult.Success -> {
+                pendingMoreInfoEntityId = result.moreInfoEntityId
                _viewState.update {


Copilot

Pull request overview

Copilot reviewed 30 out of 30 changed files in this pull request and generated 5 comments.

+        var targetConsumed = false
        serverManager.connectionStateProvider(actualServerId).urlFlow().collect { urlState ->
-            val currentPath = if (pathConsumed) null else path
+            val currentTarget = if (targetConsumed) FrontendTarget.Default else target

            val result = handleUrlState(
                serverId = actualServerId,
                urlState = urlState,
-                path = currentPath,
+                target = currentTarget,
            )
-            // Only consume the path when a URL was actually loaded with it
+            // Only consume the target when a URL was actually loaded with it
            if (urlState is UrlState.HasUrl) {
-                pathConsumed = true
+                targetConsumed = true
            }


jpelgrom

Sorry for the delay. Reviewed again while also considering the next PR and changes almost all look good, just one issue found!

Copilot AI review requested due to automatic review settings June 24, 2026 14:57

home-assistant Bot added the cla-signed label Jun 24, 2026

Copilot started reviewing on behalf of TimoPtr June 24, 2026 14:58 View session

TimoPtr added the WebViewActivity replacement Ongoing work to replace the WebViewActivity in favor of a well tested compose screen using nav. label Jun 24, 2026

TimoPtr requested a review from jpelgrom June 24, 2026 14:58

TimoPtr mentioned this pull request Jun 24, 2026

Android Webview refactor home-assistant/epics#51

Closed

61 tasks

Copilot AI reviewed Jun 24, 2026

View reviewed changes

TimoPtr force-pushed the feature/more-info_deep-link branch from bf2969f to 8c88dd9 Compare June 25, 2026 11:26

TimoPtr requested a review from Copilot June 25, 2026 12:01

Copilot started reviewing on behalf of TimoPtr June 25, 2026 12:02 View session

Copilot AI reviewed Jun 25, 2026

View reviewed changes

jpelgrom reviewed Jul 1, 2026

View reviewed changes

Comment thread ...in/io/homeassistant/companion/android/settings/shortcuts/legacy/views/ManageShortcutsView.kt

jpelgrom reviewed Jul 7, 2026

View reviewed changes

Comment thread app/src/main/kotlin/io/homeassistant/companion/android/controls/HaControl.kt

TimoPtr added 6 commits July 8, 2026 09:08

Introduce FrontendTarget and use it instead of WebViewActivity

5398cea

Replace usage of WebViewActivity.newInstance

cff2b50

Add support for more info for old server

6ce2db3

Replace WebViewActivity call in MatterCommissioningActivity

2aa44c9

Apply some copilot suggestions

910db32

Add missing action to LaunchActivity intent

406524a

TimoPtr force-pushed the feature/more-info_deep-link branch from 60e840c to 406524a Compare July 8, 2026 09:02

jpelgrom approved these changes Jul 8, 2026

View reviewed changes

jpelgrom merged commit 2717a34 into main Jul 8, 2026
24 checks passed

jpelgrom deleted the feature/more-info_deep-link branch July 8, 2026 19:52

Navigation Menu

Uh oh!

Uh oh!

Introduce FrontendTarget and use it instead of WebViewActivity - #7087

Introduce FrontendTarget and use it instead of WebViewActivity#7087
jpelgrom merged 6 commits into
mainfrom
feature/more-info_deep-link

TimoPtr commented Jun 24, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

TimoPtr Jun 30, 2026

Uh oh!

TimoPtr Jun 30, 2026

Uh oh!

jpelgrom Jul 1, 2026

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jpelgrom left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Uh oh!

Conversation

TimoPtr commented Jun 24, 2026

Summary

Checklist

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

TimoPtr Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

TimoPtr Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

jpelgrom Jul 1, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jpelgrom left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants