From 9893383a0b3d42798e4d7c240769dfa9f4d6828f Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 20 Jan 2021 09:20:07 +0100 Subject: [PATCH] On demand init of work manager --- app/src/fdroid/AndroidManifest.xml | 5 +++++ app/src/github/AndroidManifest.xml | 5 +++++ app/src/main/AndroidManifest.xml | 5 +++++ .../main/java/eu/faircode/email/ApplicationEx.java | 14 +++++++++++++- app/src/play/AndroidManifest.xml | 5 +++++ 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml index aa8066776b..7a84bb7fab 100644 --- a/app/src/fdroid/AndroidManifest.xml +++ b/app/src/fdroid/AndroidManifest.xml @@ -374,6 +374,11 @@ android:resource="@xml/fileprovider_paths" /> + + diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml index aa8066776b..7a84bb7fab 100644 --- a/app/src/github/AndroidManifest.xml +++ b/app/src/github/AndroidManifest.xml @@ -374,6 +374,11 @@ android:resource="@xml/fileprovider_paths" /> + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5987039481..1e42c94b56 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -374,6 +374,11 @@ android:resource="@xml/fileprovider_paths" /> + + diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index af9aad69fb..2edd2bb8f9 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -32,6 +32,7 @@ import android.os.Looper; import android.util.Printer; import android.webkit.CookieManager; +import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; import java.util.Date; @@ -39,7 +40,8 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -public class ApplicationEx extends Application implements SharedPreferences.OnSharedPreferenceChangeListener { +public class ApplicationEx extends Application + implements androidx.work.Configuration.Provider, SharedPreferences.OnSharedPreferenceChangeListener { private Thread.UncaughtExceptionHandler prev = null; @Override @@ -132,6 +134,7 @@ public class ApplicationEx extends Application implements SharedPreferences.OnSh CookieManager.getInstance().setAcceptCookie(false); MessageHelper.setSystemProperties(this); + ContactInfo.init(this); DisconnectBlacklist.init(this); @@ -161,6 +164,15 @@ public class ApplicationEx extends Application implements SharedPreferences.OnSh Log.i("App created " + (end - start) + " ms"); } + @NonNull + @Override + public androidx.work.Configuration getWorkManagerConfiguration() { + // https://developer.android.com/topic/libraries/architecture/workmanager/advanced/custom-configuration + return new androidx.work.Configuration.Builder() + .setMinimumLoggingLevel(android.util.Log.INFO) + .build(); + } + @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { switch (key) { diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml index 6ee33da8c6..fd0f26c345 100644 --- a/app/src/play/AndroidManifest.xml +++ b/app/src/play/AndroidManifest.xml @@ -375,6 +375,11 @@ android:resource="@xml/fileprovider_paths" /> + +