Skip to content

Makes alarm_control_panels more flexible on Android auto #6374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
poupounetjoyeux wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Makes alarm_control_panels more flexible on Android auto #6374

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
27320f7
Makes alarm_control_panels more flexible on Android auto
poupounetjoyeux Feb 2, 2026
986625c
Merge branch 'main' into main
poupounetjoyeux Feb 2, 2026
197c724
Fix lint errors and add testing
poupounetjoyeux Feb 3, 2026
1d31803
Merge branch 'main' into main
poupounetjoyeux Feb 5, 2026
f7b4041
Address remarks
poupounetjoyeux Feb 6, 2026
933c834
Address remarks
poupounetjoyeux Feb 26, 2026
b976a13
Address remarks
poupounetjoyeux Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/src/main/kotlin/io/homeassistant/companion/android/util/vehicle/DomainChecks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ val MAP_DOMAINS = listOf(
)

val NOT_ACTIONABLE_DOMAINS = listOf(
"alarm_control_panel",
"binary_sensor",
"sensor",
)
Expand All @@ -45,9 +44,3 @@ fun canNavigate(entity: Entity): Boolean {
((entity.attributes["longitude"] as? Number)?.toDouble() != null)
)
}

fun alarmHasNoCode(entity: Entity): Boolean {
return entity.domain == "alarm_control_panel" &&
entity.attributes["code_format"] as? String == null &&
entity.supportsAlarmControlPanelArmAway()
}
3 changes: 1 addition & 2 deletions app/src/main/kotlin/io/homeassistant/companion/android/vehicle/EntityGridVehicleScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import io.homeassistant.companion.android.common.data.websocket.impl.entities.En
import io.homeassistant.companion.android.util.vehicle.MAP_DOMAINS
import io.homeassistant.companion.android.util.vehicle.NOT_ACTIONABLE_DOMAINS
import io.homeassistant.companion.android.util.vehicle.SUPPORTED_DOMAINS
import io.homeassistant.companion.android.util.vehicle.alarmHasNoCode
import io.homeassistant.companion.android.util.vehicle.canNavigate
import io.homeassistant.companion.android.util.vehicle.getChangeServerGridItem
import io.homeassistant.companion.android.util.vehicle.getDomainList
Expand Down Expand Up @@ -174,7 +173,7 @@ class EntityGridVehicleScreen(
if (entity.isExecuting()) {
gridItem.setLoading(entity.isExecuting())
} else {
if (entity.domain !in NOT_ACTIONABLE_DOMAINS || canNavigate(entity) || alarmHasNoCode(entity)) {
if (entity.domain !in NOT_ACTIONABLE_DOMAINS || canNavigate(entity)) {
Comment thread
jpelgrom marked this conversation as resolved.
Outdated
gridItem
.setOnClickListener {
Timber.i("${entity.entityId} clicked")
Expand Down
18 changes: 17 additions & 1 deletion common/src/main/kotlin/io/homeassistant/companion/android/common/data/integration/Entity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,14 @@ fun Entity.getCoverPosition(): EntityPosition? {
}
}

fun Entity.alarmHasNoCode(): Boolean {
return domain == "alarm_control_panel" && attributes["code_format"] as? String == null
}

fun Entity.alarmCanBeArmedWithoutCode(): Boolean {
return domain == "alarm_control_panel" && attributes["code_arm_required"] as? Boolean == true
}

fun Entity.supportsAlarmControlPanelArmAway(): Boolean {
return try {
if (domain != "alarm_control_panel") return false
Expand Down Expand Up @@ -809,7 +817,13 @@ suspend fun Entity.onPressed(integrationRepository: IntegrationRepository) {
}

"alarm_control_panel" -> {
if (state != "disarmed") "alarm_disarm" else "alarm_arm_away"
if (state == "disarmed" && supportsAlarmControlPanelArmAway() && alarmCanBeArmedWithoutCode()) {
"alarm_arm_away"
} else if (state != "disarmed" && alarmHasNoCode()) {
"alarm_disarm"
} else {
null
}
}

in EntityExt.DOMAINS_PRESS -> "press"
Expand All @@ -825,6 +839,8 @@ suspend fun Entity.onPressed(integrationRepository: IntegrationRepository) {
else -> "toggle"
}

if (action == null) return;
Comment thread Fixed

integrationRepository.callAction(
domain = this.domain,
action = action,
Expand Down