Infomaniak · FabianDevel · Feb 12, 2024 · Feb 5, 2024
diff --git a/Core b/Core
diff --git a/app/src/main/java/com/infomaniak/mail/MainApplication.kt b/app/src/main/java/com/infomaniak/mail/MainApplication.kt
@@ -43,14 +43,14 @@ import com.infomaniak.lib.core.utils.clearStack
 import com.infomaniak.lib.core.utils.hasPermissions
 import com.infomaniak.lib.core.utils.showToast
 import com.infomaniak.lib.login.ApiToken
+import com.infomaniak.lib.stores.AppUpdateScheduler
 import com.infomaniak.mail.MatomoMail.buildTracker
 import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.api.UrlTraceInterceptor
 import com.infomaniak.mail.di.IoDispatcher
 import com.infomaniak.mail.di.MainDispatcher
 import com.infomaniak.mail.ui.LaunchActivity
 import com.infomaniak.mail.utils.*
-import com.infomaniak.mail.workers.AppUpdateWorker
 import com.infomaniak.mail.workers.SyncMailboxesWorker
 import dagger.hilt.android.HiltAndroidApp
 import io.sentry.SentryEvent
@@ -102,7 +102,7 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
     lateinit var syncMailboxesWorkerScheduler: SyncMailboxesWorker.Scheduler
 
     @Inject
-    lateinit var appUpdateWorkerScheduler: AppUpdateWorker.Scheduler
+    lateinit var appUpdateWorkerScheduler: AppUpdateScheduler
 
     @Inject
     @IoDispatcher

diff --git a/app/src/main/java/com/infomaniak/mail/di/ActivityModule.kt b/app/src/main/java/com/infomaniak/mail/di/ActivityModule.kt
@@ -18,7 +18,7 @@
 package com.infomaniak.mail.di
 
 import androidx.fragment.app.FragmentActivity
-import com.infomaniak.lib.stores.InAppUpdateManager
+import com.infomaniak.lib.stores.updatemanagers.InAppUpdateManager
 import com.infomaniak.mail.BuildConfig
 import com.infomaniak.mail.MatomoMail.DISCOVER_LATER
 import com.infomaniak.mail.MatomoMail.DISCOVER_NOW

diff --git a/app/src/main/java/com/infomaniak/mail/di/ApplicationModule.kt b/app/src/main/java/com/infomaniak/mail/di/ApplicationModule.kt
@@ -21,6 +21,7 @@ import android.app.Application
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import androidx.work.WorkManager
+import com.infomaniak.lib.stores.AppUpdateScheduler
 import com.infomaniak.lib.stores.StoresLocalSettings
 import com.infomaniak.mail.MainApplication
 import com.infomaniak.mail.data.LocalSettings
@@ -66,4 +67,11 @@ object ApplicationModule {
     @Provides
     @Singleton
     fun providesStoresLocalSettings(appContext: Context): StoresLocalSettings = StoresLocalSettings.getInstance(appContext)
+
+    @Provides
+    @Singleton
+    fun providesAppUpdateWorkerScheduler(
+        appContext: Context,
+        workManager: WorkManager,
+    ): AppUpdateScheduler = AppUpdateScheduler(appContext, workManager)
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt b/app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt
@@ -43,9 +43,9 @@ import com.infomaniak.lib.core.utils.*
 import com.infomaniak.lib.core.utils.Utils
 import com.infomaniak.lib.core.utils.Utils.toEnumOrThrow
 import com.infomaniak.lib.core.utils.UtilsUi.openUrl
-import com.infomaniak.lib.stores.InAppUpdateManager
 import com.infomaniak.lib.stores.StoreUtils
 import com.infomaniak.lib.stores.StoreUtils.launchInAppReview
+import com.infomaniak.lib.stores.updatemanagers.InAppUpdateManager
 import com.infomaniak.mail.BuildConfig
 import com.infomaniak.mail.MatomoMail.trackAppReviewEvent
 import com.infomaniak.mail.MatomoMail.trackDestination

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -46,7 +46,7 @@ import com.ernestoyaquello.dragdropswiperecyclerview.listener.OnListScrollListen
 import com.ernestoyaquello.dragdropswiperecyclerview.listener.OnListScrollListener.ScrollState
 import com.infomaniak.lib.core.MatomoCore.TrackerAction
 import com.infomaniak.lib.core.utils.*
-import com.infomaniak.lib.stores.InAppUpdateManager
+import com.infomaniak.lib.stores.updatemanagers.InAppUpdateManager
 import com.infomaniak.mail.MatomoMail.trackEvent
 import com.infomaniak.mail.MatomoMail.trackMenuDrawerEvent
 import com.infomaniak.mail.MatomoMail.trackMultiSelectionEvent

diff --git a/app/src/main/java/com/infomaniak/mail/workers/AppUpdateWorker.kt b/app/src/main/java/com/infomaniak/mail/workers/AppUpdateWorker.kt
+3 −0		Stores/build.gradle
+26 −0		Stores/src/fdroid/java/com/infomaniak/lib/stores/AppUpdateScheduler.kt
+0 −0		Stores/src/fdroid/java/com/infomaniak/lib/stores/StoreUtils.kt
+3 −1		Stores/src/fdroid/java/com/infomaniak/lib/stores/updatemanagers/InAppUpdateManager.kt
+25 −0		Stores/src/fdroid/java/com/infomaniak/lib/stores/updatemanagers/WorkerUpdateManager.kt
+0 −62		Stores/src/main/java/StoresUtils.kt
+0 −0		Stores/src/main/java/com/infomaniak/lib/stores/BaseInAppUpdateManager.kt
+0 −0		Stores/src/main/java/com/infomaniak/lib/stores/StoresLocalSettings.kt
+27 −0		Stores/src/main/java/com/infomaniak/lib/stores/StoresUtils.kt
+1 −1		Stores/src/main/java/com/infomaniak/lib/stores/StoresViewModel.kt
+31 −0		Stores/src/main/java/com/infomaniak/lib/stores/UpdateScheduler.kt
+0 −152		Stores/src/standard/java/com.infomaniak.lib.stores/StoreUtils.kt
+104 −0		Stores/src/standard/java/com/infomaniak/lib/stores/AppUpdateScheduler.kt
+38 −0		Stores/src/standard/java/com/infomaniak/lib/stores/StoreUtils.kt
+4 −1		Stores/src/standard/java/com/infomaniak/lib/stores/updatemanagers/InAppUpdateManager.kt
+38 −0		Stores/src/standard/java/com/infomaniak/lib/stores/updatemanagers/WorkerUpdateManager.kt