demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-02-04 03:14:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handling null WifiInformation (#16700)

Browse Source 
Signed-off-by: Gaël L'hopital <gael@lhopital.org>
Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
This commit is contained in:
Gaël L'hopital 2024-04-29 01:32:55 +02:00 committed by Ciprian Pascu
parent 7e062102fa
commit 84f97476e6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/APManager.java
View File

@ -46,14 +46,16 @@ public class APManager extends ListableRest<APManager.WifiAp, APManager.APRespon
long txBytes, // transmitted bytes (from Freebox to station) long txBytes, // transmitted bytes (from Freebox to station)
long txRate, // reception data rate (in bytes/s) long txRate, // reception data rate (in bytes/s)
long rxRate, // transmission data rate (in bytes/s) long rxRate, // transmission data rate (in bytes/s)
WifiInformation wifiInformation) { @Nullable WifiInformation wifiInformation) {
public int getSignal() { public int getRSSI() {
return wifiInformation.signal(); WifiInformation local = wifiInformation;
return local != null ? local.signal : 1;
} }
public @Nullable String getSsid() { public @Nullable String getSsid() {
return wifiInformation().ssid(); WifiInformation local = wifiInformation;
return local != null ? local.ssid : null;
} }
} }

2
bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/WifiStationHandler.java
View File

@ -73,7 +73,7 @@ public class WifiStationHandler extends HostHandler {
LanAccessPoint lanAp = wifiHost.get().accessPoint(); LanAccessPoint lanAp = wifiHost.get().accessPoint();
if (lanAp != null) { if (lanAp != null) {
updateChannelString(GROUP_WIFI, WIFI_HOST, "%s-%s".formatted(lanAp.type(), lanAp.uid())); updateChannelString(GROUP_WIFI, WIFI_HOST, "%s-%s".formatted(lanAp.type(), lanAp.uid()));
updateWifiStationChannels(lanAp.getSignal(), lanAp.getSsid(), lanAp.rxRate(), lanAp.txRate()); updateWifiStationChannels(lanAp.getRSSI(), lanAp.getSsid(), lanAp.rxRate(), lanAp.txRate());
return; return;
} }
} }