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

Commit 5c6814fa authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch '6236-remove-workers' into 'release-1.6-rc' 

Introduce WeatherUpdater instead of workers

See merge request !136
parents d27e5894 5d275334

app/build.gradle.kts

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


    // elib

    implementation(libs.elib)



    // workmanager

    implementation(libs.workmanager)

}

app/src/main/java/foundation/e/blisslauncher/core/utils/Constants.java

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ public class Constants { 


    // other shared pref entries

    public static final String WEATHER_LAST_UPDATE = "last_weather_update";

    public static final String WEATHER_LAST_TRY = "last_weather_try";

    public static final String WEATHER_DATA = "weather_data";



    // First run is used to hide the initial no-weather message for a better OOBE

app/src/main/java/foundation/e/blisslauncher/features/launcher/AppProvider.java

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class AppProvider { 
    private static final String PDF_VIEWER_PACKAGE = "foundation.e.pdfviewer";

    private static final String OPENKEYCHAIN_PACKAGE = "org.sufficientlysecure.keychain";

    private static final String LIBREOFFICE_PACKAGE = "org.documentfoundation.libreoffice";

    private static final String LIBREOFFICE_PACKAGE2 = "org.example.libreoffice";

    private static final String SIM_TOOLKIT = "com.android.stk";



    public static HashSet<String> DISABLED_PACKAGES = new HashSet<>();
@@ -84,6 +85,7 @@ public class AppProvider { 
        DISABLED_PACKAGES.add(PDF_VIEWER_PACKAGE);

        DISABLED_PACKAGES.add(OPENKEYCHAIN_PACKAGE);

        DISABLED_PACKAGES.add(LIBREOFFICE_PACKAGE);

        DISABLED_PACKAGES.add(LIBREOFFICE_PACKAGE2);

        DISABLED_PACKAGES.add(SIM_TOOLKIT);

    }

app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java

+12 −0
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ public class LauncherActivity extends AppCompatActivity 
        forceRefreshSuggestedApps = true;

        removePackageFromLauncher(appRemoveEvent.getPackageName(), appRemoveEvent.getUserHandle());

        DatabaseManager.getManager(this).saveLayouts(pages, mDock);

        rebindAllWidgets();

    }



    public void onAppChangeEvent(AppChangeEvent appChangeEvent) {
@@ -1468,12 +1469,23 @@ public class LauncherActivity extends AppCompatActivity 
        }

        // [[END]]



        rebindWidgetHost();

    }



    private void rebindWidgetHost() {

        int[] widgetIds = mAppWidgetHost.getAppWidgetIds();

        getCompositeDisposable().add(DatabaseManager.getManager(this).getWidgets(widgetIds)

                .subscribeOn(Schedulers.from(AppExecutors.getInstance().diskIO()))

                .observeOn(AndroidSchedulers.mainThread()).subscribe(this::bindWidgets));

    }



    public void rebindAllWidgets() {

        if (widgetsPage != null) {

            widgetContainer.removeAllViewsInLayout();

            rebindWidgetHost();

        }

    }



    private void bindWidgets(List<WidgetItem> widgets) {

        for (WidgetItem widget : widgets) {

            AppWidgetProviderInfo appWidgetInfo = mAppWidgetManager.getAppWidgetInfo(widget.id);

app/src/main/java/foundation/e/blisslauncher/features/weather/WeatherInfoView.java

+1 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; 
import foundation.e.blisslauncher.R;

import foundation.e.blisslauncher.core.Preferences;

import foundation.e.blisslauncher.features.launcher.LauncherActivity;

import foundation.e.blisslauncher.features.weather.worker.ForceWeatherRequestWorker;



public class WeatherInfoView extends LinearLayout {
@@ -54,7 +53,7 @@ public class WeatherInfoView extends LinearLayout { 
        });

        findViewById(R.id.weather_setting_imageview).setOnClickListener(v -> startWeatherPreferences());

        findViewById(R.id.weather_refresh_imageview).setOnClickListener(v -> {

            ForceWeatherRequestWorker.start(mContext);

            WeatherUpdater.getInstance(mContext).forceWeatherRequest();

        });

    }