refactor(AppUpdateWorker): Use Update worker from Core

Infomaniak · Feb 5, 2024 · 6e7b5db · 6e7b5db
1 parent c1f3a39
commit 6e7b5db
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 116 deletions.
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.AppUpdateWorker
 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

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.AppUpdateWorker
 import com.infomaniak.mail.MainApplication
 import com.infomaniak.mail.data.LocalSettings
 import dagger.Module
@@ -61,4 +62,8 @@ object ApplicationModule {
     @Provides
     @Singleton
     fun providesLocalSettings(appContext: Context): LocalSettings = LocalSettings.getInstance(appContext)
+
+    @Provides
+    @Singleton
+    fun providesAppUpdateWorkerScheduler(appContext: Context): AppUpdateWorker.Scheduler = AppUpdateWorker.Scheduler(appContext)
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt b/app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt
@@ -44,9 +44,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.DISCOVER_LATER
 import com.infomaniak.mail.MatomoMail.DISCOVER_NOW

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
@@ -47,7 +47,7 @@ import com.ernestoyaquello.dragdropswiperecyclerview.listener.OnListScrollListen
 import com.infomaniak.lib.core.MatomoCore.TrackerAction
 import com.infomaniak.lib.core.utils.*
 import com.infomaniak.lib.core.utils.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
+9 −2		Stores/build.gradle
+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
+94 −0		Stores/src/main/java/AppUpdateWorker.kt
+1 −36		Stores/src/main/java/StoresUtils.kt
+1 −1		Stores/src/main/java/StoresViewModel.kt
+0 −114		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