[upnpcontrol] Ignore negative volume values #17991
Conversation
Signed-off-by: Stefan Höhn <stefan.hoehn@nfon.com>
|
This pull request has been mentioned on openHAB Community. There might be relevant details there: |
jlaur
changed the title
| @@ -1113,6 +1113,11 @@ private void onValueReceivedVolume(String variable, @Nullable String value) { | |||
| long volume = Long.valueOf(value); | |||
| volume = volume * 100 / config.maxvolume; | |||
|
|
|||
| if (volume < 0) { | |||
There was a problem hiding this comment.
Perhaps this could be checked right after line 1113 to avoid performing any calculations with invalid value?
There was a problem hiding this comment.
In the identified error case, volume came from the service as a negative. But there might also be a case where config.maxvolume (also retrieved from the service) is negative and that would lead to problems as well. Or we catch this bad data where config.maxvolume is set as well, or we leave this statement where it is.
There was a problem hiding this comment.
Too many ORs 😅 So what do we wanna do?
There was a problem hiding this comment.
Move it right after line 1113, but also change here:
Put the following on that line:
if (volume && volume > 0)
In principle, it should be a positive integer less than or equal to 100. You could also log a warning there if it is not.
There was a problem hiding this comment.
@stefan-hoehn are you able to continue?
There was a problem hiding this comment.
I honestly forgot about it. Will take care about it on the weekend. Thanks for reminding me.
There was a problem hiding this comment.
@mherwege
Now looking on UpnpRenderingControlConfiguration
if (volume && volume > 0)
doesn't work because volume here is a boolean
public boolean volume;
We rather have to take care of the maxvolume here, so I think the following should be right
if (volume) {
long maxVolumeValue = rcService.getStateVariable("Volume").getTypeDetails().getAllowedValueRange().getMaximum();
if (maxVolumeValue >= 0) {
maxvolume = maxVolumeValue;
}
}
There was a problem hiding this comment.
Yes, sorry for the wrong suggestion. What you propose is fine, except, I would make it maxVolumeValue > 0. 0 would obviously also be an issue when dividing by maxvolume afterwards, and wouldn’t make sense.
...trol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandler.java
Show resolved
Hide resolved
...trol/src/main/java/org/openhab/binding/upnpcontrol/internal/handler/UpnpRendererHandler.java
Show resolved
Hide resolved
Signed-off-by: Stefan Höhn <stefan.hoehn@nfon.com>
| maxvolume = rcService.getStateVariable("Volume").getTypeDetails().getAllowedValueRange().getMaximum(); | ||
| long maxVolumeValue = rcService.getStateVariable("Volume").getTypeDetails().getAllowedValueRange() | ||
| .getMaximum(); | ||
| if (maxVolumeValue >= 0) { |
There was a problem hiding this comment.
| if (maxVolumeValue >= 0) { | |
| if (maxVolumeValue > 0) { |
Signed-off-by: Stefan Höhn <stefan.hoehn@nfon.com>
* upnp: ignore negative volume values Signed-off-by: Stefan Höhn <stefan.hoehn@nfon.com>
I have at least one upnp system that is sending incorrect negative volume values. This change make the binding resilient by ignoring negative volume values.