github
/
ha-android
mirror of https://github.com/home-assistant/android
1
Fork 0
Code Releases Activity

Add some missing states for audio sensor and correct mic muted intent condition (#4350) 

* Add some missing states for audio sensor

* Correct improper SDK check for mic muted intent action

* Update wear intent receivers

* Correct mic muted sensor update type
This commit is contained in:
Daniel Shokouhi 2024-04-20 06:44:04 -07:00 committed by GitHub
parent 177a040f57
commit 4d9498c02b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt
View File

@ -163,14 +163,19 @@ open class HomeAssistantApplication : Application() {
}
)
// Add extra audio receiver for devices that support it
// Listen for microphone mute changes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
registerReceiver(
sensorReceiver,
IntentFilter(AudioManager.ACTION_MICROPHONE_MUTE_CHANGED)
)
}
// Listen for speakerphone state changes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
registerReceiver(
sensorReceiver,
IntentFilter().apply {
addAction(AudioManager.ACTION_MICROPHONE_MUTE_CHANGED)
addAction(AudioManager.ACTION_SPEAKERPHONE_STATE_CHANGED)
}
IntentFilter(AudioManager.ACTION_SPEAKERPHONE_STATE_CHANGED)
)
}

6
common/src/main/java/io/homeassistant/companion/android/common/sensors/AudioSensorManager.kt
View File

@ -44,7 +44,7 @@ class AudioSensorManager : SensorManager {
commonR.string.sensor_description_mic_muted,
"mdi:microphone-off",
updateType =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
SensorManager.BasicSensor.UpdateType.INTENT
} else {
SensorManager.BasicSensor.UpdateType.WORKER
@ -226,6 +226,8 @@ class AudioSensorManager : SensorManager {
AudioManager.MODE_IN_CALL -> "in_call"
AudioManager.MODE_IN_COMMUNICATION -> "in_communication"
AudioManager.MODE_CALL_SCREENING -> "call_screening"
AudioManager.MODE_CALL_REDIRECT -> "call_redirect"
AudioManager.MODE_COMMUNICATION_REDIRECT -> "communication_redirect"
else -> STATE_UNKNOWN
}
@ -235,6 +237,8 @@ class AudioSensorManager : SensorManager {
AudioManager.MODE_IN_CALL -> "mdi:phone"
AudioManager.MODE_IN_COMMUNICATION -> "mdi:message-video"
AudioManager.MODE_CALL_SCREENING -> "mdi:microphone-message"
AudioManager.MODE_CALL_REDIRECT -> "mdi:phone"
AudioManager.MODE_COMMUNICATION_REDIRECT -> "mdi:message-video"
else -> "mdi:volume-low"
}

15
wear/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt
View File

@ -78,14 +78,19 @@ open class HomeAssistantApplication : Application() {
}
)
// Add extra audio receiver for devices that support it
// Listen for microphone mute changes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
registerReceiver(
sensorReceiver,
IntentFilter(AudioManager.ACTION_MICROPHONE_MUTE_CHANGED)
)
}
// Listen for speakerphone state changes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
registerReceiver(
sensorReceiver,
IntentFilter().apply {
addAction(AudioManager.ACTION_MICROPHONE_MUTE_CHANGED)
addAction(AudioManager.ACTION_SPEAKERPHONE_STATE_CHANGED)
}
IntentFilter(AudioManager.ACTION_SPEAKERPHONE_STATE_CHANGED)
)
}