From a8980dbe7bc9cc3718ed04b452e14fce7105f7df Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Thu, 5 May 2016 23:35:32 -0700 Subject: YahooCM: Hardcode forecast day count. Add todo for future user configuration. Change-Id: I20690e9771448635766e84d591047217b94b64e4 --- .../java/org/cyanogenmod/yahooweatherprovider/ConverterUtils.java | 8 +++++++- .../yahooweatherprovider/YahooWeatherProviderService.java | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'app/src') diff --git a/app/src/main/java/org/cyanogenmod/yahooweatherprovider/ConverterUtils.java b/app/src/main/java/org/cyanogenmod/yahooweatherprovider/ConverterUtils.java index 53b2158..635b5b7 100644 --- a/app/src/main/java/org/cyanogenmod/yahooweatherprovider/ConverterUtils.java +++ b/app/src/main/java/org/cyanogenmod/yahooweatherprovider/ConverterUtils.java @@ -38,15 +38,21 @@ import static cyanogenmod.providers.WeatherContract.WeatherColumns.WeatherCode.S public class ConverterUtils { - public static ArrayList convertForecastsToDayForecasts(List forecasts) { + public static ArrayList convertForecastsToDayForecasts( + List forecasts, int max) { ArrayList ret = new ArrayList<>(); + int i = 0; for (Forecast forecast : forecasts) { + if (i > max) { + break; + } WeatherInfo.DayForecast dayForecast = new WeatherInfo.DayForecast.Builder(offset( Integer.parseInt(forecast.getCode()))) .setHigh(Double.parseDouble(forecast.getHigh())) .setLow(Double.parseDouble(forecast.getLow())) .build(); ret.add(dayForecast); + i++; } return ret; } diff --git a/app/src/main/java/org/cyanogenmod/yahooweatherprovider/YahooWeatherProviderService.java b/app/src/main/java/org/cyanogenmod/yahooweatherprovider/YahooWeatherProviderService.java index e3fd365..63c0f96 100644 --- a/app/src/main/java/org/cyanogenmod/yahooweatherprovider/YahooWeatherProviderService.java +++ b/app/src/main/java/org/cyanogenmod/yahooweatherprovider/YahooWeatherProviderService.java @@ -64,6 +64,9 @@ public class YahooWeatherProviderService extends WeatherProviderService private static final int SERVICE_REQUEST_CANCELLED = -1; private static final int SERVICE_REQUEST_SUBMITTED = 0; + //TODO, add a setting for this + private static final int MAX_FORECAST_DAYS = 5; + @Inject public YahooWeatherServiceManager mYahooWeatherServiceManager; @@ -265,7 +268,7 @@ public class YahooWeatherProviderService extends WeatherProviderService ArrayList forecastList = ConverterUtils.convertForecastsToDayForecasts( - Arrays.asList(forecasts)); + Arrays.asList(forecasts), MAX_FORECAST_DAYS); // Remove today forecastList.remove(0); -- cgit v1.2.3