mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-09-06 17:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix BLE command when enabling or disabling the transmitter (#2313)

Browse source
This commit is contained in:
Daniel Shokouhi 2022-02-24 08:14:31 -08:00 committed by GitHub
parent e3bd338bf1
commit d0842ab557
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/io/homeassistant/companion/android/notifications/MessagingManager.kt
View file

@ -196,7 +196,7 @@ class MessagingManager @Inject constructor(
MEDIA_FAST_FORWARD, MEDIA_NEXT, MEDIA_PAUSE, MEDIA_PLAY,
MEDIA_PLAY_PAUSE, MEDIA_PREVIOUS, MEDIA_REWIND, MEDIA_STOP
)
val BLE_COMMANDS = listOf(TURN_OFF, TURN_ON, BLE_SET_ADVERTISE_MODE, BLE_SET_TRANSMIT_POWER)
val BLE_COMMANDS = listOf(BLE_SET_ADVERTISE_MODE, BLE_SET_TRANSMIT_POWER)
val BLE_TRANSMIT_COMMANDS =
listOf(BLE_TRANSMIT_HIGH, BLE_TRANSMIT_LOW, BLE_TRANSMIT_MEDIUM, BLE_TRANSMIT_ULTRA_LOW)
val BLE_ADVERTISE_COMMANDS =
@ -313,10 +313,13 @@ class MessagingManager @Inject constructor(
}
COMMAND_BLE_TRANSMITTER -> {
if (
(!jsonData[TITLE].isNullOrEmpty() && jsonData[TITLE] in BLE_COMMANDS) &&
(!jsonData[TITLE].isNullOrEmpty() && jsonData[TITLE] in ENABLE_COMMANDS) ||
(
!jsonData[BLE_ADVERTISE].isNullOrEmpty() && jsonData[BLE_ADVERTISE] in BLE_ADVERTISE_COMMANDS ||
!jsonData[BLE_TRANSMIT].isNullOrEmpty() && jsonData[BLE_TRANSMIT] in BLE_TRANSMIT_COMMANDS
(!jsonData[TITLE].isNullOrEmpty() && jsonData[TITLE] in BLE_COMMANDS) &&
(
!jsonData[BLE_ADVERTISE].isNullOrEmpty() && jsonData[BLE_ADVERTISE] in BLE_ADVERTISE_COMMANDS ||
!jsonData[BLE_TRANSMIT].isNullOrEmpty() && jsonData[BLE_TRANSMIT] in BLE_TRANSMIT_COMMANDS
)
)
)
handleDeviceCommands(jsonData)