Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 078dc236 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Refactorize weather widget implementation 

Simplify WeatherUpdateService and introduce 2 workers:
- OneTimeWeatherRequestWorker
- ForceWeatherRequestWorker

WeatherUpdateService schedules every 10 seconds a
OneTimeWeatherRequestWorker that checks if a weather request
is needed according to the period set in the widget settings.
Default period has been adjusted to 15 minutes.

The widget update button triggers a ForceWeatherRequestWorker
which forces a high accuracy location request.
parent 1f8c72df

app/build.gradle.kts

+3 −0
Original line number Diff line number Diff line
@@ -184,4 +184,7 @@ dependencies { 


    // elib

    implementation(libs.elib)



    // workmanager

    implementation(libs.workmanager)

}

app/src/apiNougat/java/foundation/e/blisslauncher/features/weather/WeatherUpdateService.java

+0 −4
Original line number Diff line number Diff line
@@ -399,11 +399,7 @@ public class WeatherUpdateService extends Service { 
            finishedIntent.putExtra(EXTRA_UPDATE_CANCELLED, updateCancelled);

            mContext.sendBroadcast(finishedIntent);



            if (D)

                Log.d(TAG, "RELEASING WAKELOCK");

            mWakeLock.release();

            mIsProcessingWeatherUpdate = false;

            mContext.stopService(new Intent(mContext, WeatherUpdateService.class));

        }



        @Override

app/src/apiNougat/res/xml/preferences_weather.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        <ListPreference

            android:key="weather_refresh_interval"

            android:dependency="weather_source"

            android:defaultValue="60"

            android:defaultValue="15"

            android:summary="%s"

            android:entries="@array/weather_interval_entries"

            android:entryValues="@array/weather_interval_values"

app/src/apiOreo/java/foundation/e/blisslauncher/features/weather/DeviceStatusService.java

+0 −8
Original line number Diff line number Diff line
@@ -34,14 +34,6 @@ public class DeviceStatusService extends Service { 
                } else {

                    context.stopService(i);

                }

            } else if (Intent.ACTION_SCREEN_OFF.equals(action)) {

                if (D)

                    Log.d(TAG, "onDisplayOff: Cancel pending update");

                WeatherUpdateService.cancelUpdates(context);

            } else if (Intent.ACTION_SCREEN_ON.equals(action)) {

                if (D)

                    Log.d(TAG, "onDisplayOn: Reschedule update");

                WeatherUpdateService.scheduleNextUpdate(context, false);

            }

        }

    };

app/src/apiOreo/java/foundation/e/blisslauncher/features/weather/ForecastBuilder.java

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ public class ForecastBuilder { 
            return;

        }



        smallPanel.setVisibility(View.VISIBLE);

        TimeZone MyTimezone = TimeZone.getDefault();

        Calendar calendar = new GregorianCalendar(MyTimezone);

        int weatherTempUnit = w.getTemperatureUnit();