Fixed startup job, show only future values in forecast screen

thuryn · May 6, 2024 · a9e0a12 · a9e0a12
1 parent 43e9e1b
commit a9e0a12
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/app/src/main/java/org/thosp/yourlocalweather/adapter/WeatherForecastAdapter.java b/app/src/main/java/org/thosp/yourlocalweather/adapter/WeatherForecastAdapter.java
@@ -59,12 +59,17 @@ public WeatherForecastAdapter(Context context,
 
         mWeatherList = new HashMap<>();
         keys = new ArrayList<>();
+        long now = System.currentTimeMillis();
         Calendar forecastCalendar = Calendar.getInstance();
         for (DetailedWeatherForecast forecast: weatherForecastList) {
             if (forecast == null) {
                 continue;
             }
-            forecastCalendar.setTimeInMillis(forecast.getDateTime() * 1000);
+            long forecastDateTimeInMs = forecast.getDateTime() * 1000;
+            if (forecastDateTimeInMs < now) {
+                continue;
+            }
+            forecastCalendar.setTimeInMillis(forecastDateTimeInMs);
             int forecastDay = forecastCalendar.get(Calendar.DAY_OF_YEAR);
             if (!mWeatherList.keySet().contains(forecastDay)) {
                 List<DetailedWeatherForecast> dayForecastList = new ArrayList<>();

diff --git a/app/src/main/java/org/thosp/yourlocalweather/service/ScreenOnOffUpdateService.java b/app/src/main/java/org/thosp/yourlocalweather/service/ScreenOnOffUpdateService.java
@@ -203,6 +203,7 @@ public void handleMessage(Message inputMessage) {
     };
 
     private void processScreenOn(Context context) {
+        WidgetUtils.updateWidgets(context);
         Message completeMessage =
                 handler.obtainMessage();
         completeMessage.obj = context;

diff --git a/app/src/main/java/org/thosp/yourlocalweather/service/StartAutoLocationJob.java b/app/src/main/java/org/thosp/yourlocalweather/service/StartAutoLocationJob.java
@@ -45,12 +45,12 @@ private enum Updated {
     @Override
     public boolean onStartJob(JobParameters params) {
         this.params = params;
+        appendLog(this, TAG, "onStartJob");
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            setNotification(params, NotificationUtils.NOTIFICATION_ID, NotificationUtils.getNotificationForActivity(this),
+            setNotification(params, NotificationUtils.NOTIFICATION_ID, NotificationUtils.getNoWeatherNotification(this),
                     JobService.JOB_END_NOTIFICATION_POLICY_DETACH);
         }
         YourLocalWeather.executor.submit(() -> {
-            appendLog(this, TAG, "onStartJob");
             try {
                 performUpdateOfLocation();
                 startSensorBasedUpdates();