From 0da552aa33327a91d019c61115cdcac2514ddc0a Mon Sep 17 00:00:00 2001 From: Daniele Gobbetti Date: Fri, 27 Oct 2023 19:01:10 +0200 Subject: [PATCH] GenericWeatherReceiver: use forecast source for uvIndex and precipProbability --- .../externalevents/GenericWeatherReceiver.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/GenericWeatherReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/GenericWeatherReceiver.java index 9e271f3a0..b56482841 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/GenericWeatherReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/GenericWeatherReceiver.java @@ -96,8 +96,8 @@ public class GenericWeatherReceiver extends BroadcastReceiver { forecast.minTemp = safelyGet(forecastJson, Integer.class, "minTemp", 0); forecast.windSpeed = safelyGet(forecastJson, Number.class, "windSpeed", 0).floatValue(); forecast.windDirection = safelyGet(forecastJson, Integer.class, "windDirection", 0); - forecast.uvIndex = safelyGet(weatherJson, Number.class, "uvIndex", 0d).floatValue(); - forecast.precipProbability = safelyGet(weatherJson, Integer.class, "precipProbability", 0); + forecast.uvIndex = safelyGet(forecastJson, Number.class, "uvIndex", 0d).floatValue(); + forecast.precipProbability = safelyGet(forecastJson, Integer.class, "precipProbability", 0); forecast.sunRise = safelyGet(forecastJson, Integer.class, "sunRise", 0); forecast.sunSet = safelyGet(forecastJson, Integer.class, "sunSet", 0); forecast.moonRise = safelyGet(forecastJson, Integer.class, "moonRise", 0); @@ -127,8 +127,8 @@ public class GenericWeatherReceiver extends BroadcastReceiver { forecast.humidity = safelyGet(forecastJson, Integer.class, "humidity", 0); forecast.windSpeed = safelyGet(forecastJson, Number.class, "windSpeed", 0).floatValue(); forecast.windDirection = safelyGet(forecastJson, Integer.class, "windDirection", 0); - forecast.uvIndex = safelyGet(weatherJson, Number.class, "uvIndex", 0d).floatValue(); - forecast.precipProbability = safelyGet(weatherJson, Integer.class, "precipProbability", 0); + forecast.uvIndex = safelyGet(forecastJson, Number.class, "uvIndex", 0d).floatValue(); + forecast.precipProbability = safelyGet(forecastJson, Integer.class, "precipProbability", 0); weatherSpec.hourly.add(forecast); }