From f9fd8f224706e5ee73b5d8647a2a3f8b71f43374 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 25 Mar 2021 18:18:57 +0100
Subject: [PATCH] Enable AndroidX startup

---
 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, 1 insertion(+), 33 deletions(-)

diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 572727ad61..016d7cc6ea 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -383,11 +383,6 @@
                 android:resource="@xml/fileprovider_paths" />
         </provider>
 
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove" />
-
         <receiver
             android:name=".Widget"
             android:exported="true"
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 572727ad61..016d7cc6ea 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -383,11 +383,6 @@
                 android:resource="@xml/fileprovider_paths" />
         </provider>
 
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove" />
-
         <receiver
             android:name=".Widget"
             android:exported="true"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d1c23e1daf..754ae806ac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -383,11 +383,6 @@
                 android:resource="@xml/fileprovider_paths" />
         </provider>
 
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove" />
-
         <receiver
             android:name=".Widget"
             android:exported="true"
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 9352ea6798..d988c3ce39 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -34,7 +34,6 @@ import android.os.strictmode.Violation;
 import android.util.Printer;
 import android.webkit.CookieManager;
 
-import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 
 import org.jetbrains.annotations.NotNull;
@@ -45,7 +44,7 @@ import java.util.Locale;
 import java.util.Map;
 
 public class ApplicationEx extends Application
-        implements androidx.work.Configuration.Provider, SharedPreferences.OnSharedPreferenceChangeListener {
+        implements SharedPreferences.OnSharedPreferenceChangeListener {
     private Thread.UncaughtExceptionHandler prev = null;
 
     @Override
@@ -191,17 +190,6 @@ public class ApplicationEx extends Application
         Log.i("App created " + (end - start) + " ms");
     }
 
-    @NonNull
-    @Override
-    public androidx.work.Configuration getWorkManagerConfiguration() {
-        // https://developer.android.com/jetpack/androidx/releases/work#2.6.0-alpha01
-        // https://developer.android.com/topic/libraries/architecture/workmanager/advanced/custom-configuration
-        Log.i("Init work manager");
-        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 65f4f49c57..16b52bd64d 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -384,11 +384,6 @@
                 android:resource="@xml/fileprovider_paths" />
         </provider>
 
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove" />
-
         <receiver
             android:name=".Widget"
             android:exported="true"