ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Missed a check

Browse source
This commit is contained in:
Ziver Koc 2021-08-30 01:19:03 +02:00
parent 4339239c33
commit 41357ed8dd
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
View file

@ -182,7 +182,7 @@ public class SmartHomeImpl extends SmartHomeApp implements TokenRegistrationList
try { try {
logger.fine("Received query request for: type=" + deviceRequest.getId()); logger.fine("Received query request for: type=" + deviceRequest.getId());
if (!deviceRequest.getCustomData().containsKey("type") && !deviceRequest.getCustomData().containsKey("id")) if (deviceRequest.getCustomData() == null || !deviceRequest.getCustomData().containsKey("type") || !deviceRequest.getCustomData().containsKey("id"))
throw new IllegalArgumentException("Device Type and ID was no supplied in customData: " + deviceRequest.getId()); throw new IllegalArgumentException("Device Type and ID was no supplied in customData: " + deviceRequest.getId());
String deviceTypeStr = (String) deviceRequest.getCustomData().get("type"); String deviceTypeStr = (String) deviceRequest.getCustomData().get("type");
@ -237,7 +237,7 @@ public class SmartHomeImpl extends SmartHomeApp implements TokenRegistrationList
for (ExecuteRequest.Inputs.Payload.Commands command : ((ExecuteRequest.Inputs) executeRequest.inputs[0]).payload.commands) { for (ExecuteRequest.Inputs.Payload.Commands command : ((ExecuteRequest.Inputs) executeRequest.inputs[0]).payload.commands) {
for (ExecuteRequest.Inputs.Payload.Commands.Devices deviceRequest : command.devices) { for (ExecuteRequest.Inputs.Payload.Commands.Devices deviceRequest : command.devices) {
try { try {
if (!deviceRequest.getCustomData().containsKey("type") && !deviceRequest.getCustomData().containsKey("id")) if (deviceRequest.getCustomData() == null || !deviceRequest.getCustomData().containsKey("type") || !deviceRequest.getCustomData().containsKey("id"))
throw new IllegalArgumentException("Device Type and ID was no supplied in customData: " + deviceRequest.getId()); throw new IllegalArgumentException("Device Type and ID was no supplied in customData: " + deviceRequest.getId());
String deviceTypeStr = (String) deviceRequest.getCustomData().get("type"); String deviceTypeStr = (String) deviceRequest.getCustomData().get("type");