chore: Simplify upload notification building

app/build.gradle.kts

@@ -155,30 +155,31 @@ sentry {
 
 dependencies {
 
-    implementation(libs.infomaniak.core)
-    implementation(libs.infomaniak.core.auth)
-    implementation(libs.infomaniak.core.avatar)
-    implementation(libs.infomaniak.core.coil)
-    implementation(libs.infomaniak.core.crossapplogin)
-    implementation(libs.infomaniak.core.fragmentnavigation)
-    implementation(libs.infomaniak.core.inappreview)
-    implementation(libs.infomaniak.core.inappupdate)
-    implementation(libs.infomaniak.core.ksuite)
-    implementation(libs.infomaniak.core.ksuite.pro)
-    implementation(libs.infomaniak.core.ksuite.myksuite)
-    implementation(libs.infomaniak.core.ktor)
-    implementation(libs.infomaniak.core.matomo)
-    implementation(libs.infomaniak.core.network)
-    implementation(libs.infomaniak.core.recyclerview)
-    implementation(libs.infomaniak.core.sentry)
-    implementation(libs.infomaniak.core.thumbnails)
-    implementation(libs.infomaniak.core.twofactorauth.back)
-    implementation(libs.infomaniak.core.twofactorauth.front)
-    implementation(libs.infomaniak.core.ui)
-    implementation(libs.infomaniak.core.ui.compose.basics)
-    implementation(libs.infomaniak.core.ui.compose.margin)
-    implementation(libs.infomaniak.core.ui.compose.materialthemefromxml)
-    implementation(libs.infomaniak.core.ui.view.edgetoedge)
+    implementation(core.infomaniak.core.auth)
+    implementation(core.infomaniak.core.avatar)
+    implementation(core.infomaniak.core.coil)
+    implementation(core.infomaniak.core.common)
+    implementation(core.infomaniak.core.crossapplogin)
+    implementation(core.infomaniak.core.fragmentnavigation)
+    implementation(core.infomaniak.core.inappreview)
+    implementation(core.infomaniak.core.inappupdate)
+    implementation(core.infomaniak.core.ksuite)
+    implementation(core.infomaniak.core.ksuite.myksuite)
+    implementation(core.infomaniak.core.ksuite.pro)
+    implementation(core.infomaniak.core.ktor)
+    implementation(core.infomaniak.core.matomo)
+    implementation(core.infomaniak.core.network)
+    implementation(core.infomaniak.core.notifications)
+    implementation(core.infomaniak.core.recyclerview)
+    implementation(core.infomaniak.core.sentry)
+    implementation(core.infomaniak.core.thumbnails)
+    implementation(core.infomaniak.core.twofactorauth.back)
+    implementation(core.infomaniak.core.twofactorauth.front)
+    implementation(core.infomaniak.core.ui)
+    implementation(core.infomaniak.core.ui.compose.basics)
+    implementation(core.infomaniak.core.ui.compose.margin)
+    implementation(core.infomaniak.core.ui.compose.materialthemefromxml)
+    implementation(core.infomaniak.core.ui.view.edgetoedge)
 
     implementation(project(":Core:Legacy"))
     implementation(project(":Core:Legacy:AppLock"))

app/src/main/java/com/infomaniak/drive/MainApplication.kt

@@ -49,6 +49,7 @@ import com.infomaniak.core.legacy.utils.NotificationUtilsCore.Companion.PENDING_
 import com.infomaniak.core.network.NetworkConfiguration
 import com.infomaniak.core.network.api.ApiController
 import com.infomaniak.core.network.networking.HttpClientConfig
+import com.infomaniak.core.notifications.notifyCompat
 import com.infomaniak.core.sentry.SentryConfig.configureSentry
 import com.infomaniak.core.twofactorauth.back.TwoFactorAuthManager
 import com.infomaniak.drive.GeniusScanUtils.initGeniusScanSdk
@@ -67,7 +68,6 @@ import com.infomaniak.drive.utils.AccountUtils
 import com.infomaniak.drive.utils.MyKSuiteDataUtils
 import com.infomaniak.drive.utils.NotificationUtils.buildGeneralNotification
 import com.infomaniak.drive.utils.NotificationUtils.initNotificationChannel
-import com.infomaniak.drive.utils.NotificationUtils.notifyCompat
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
@@ -239,7 +239,7 @@ open class MainApplication : Application(), SingletonImageLoader.Factory, Defaul
         val notificationManagerCompat = NotificationManagerCompat.from(this)
         buildGeneralNotification(getString(R.string.refreshTokenError)).apply {
             setContentIntent(pendingIntent)
-            notificationManagerCompat.notifyCompat(this@MainApplication, hashCode, build())
+            notificationManagerCompat.notifyCompat(hashCode, this)
         }
 
         applicationScope.launch {

app/src/main/java/com/infomaniak/drive/data/api/UploadTask.kt

@@ -1,6 +1,6 @@
 /*
  * Infomaniak kDrive - Android
- * Copyright (C) 2022-2025 Infomaniak Network SA
+ * Copyright (C) 2022-2026 Infomaniak Network SA
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@ import com.infomaniak.core.network.models.ApiResponse
 import com.infomaniak.core.network.networking.HttpUtils
 import com.infomaniak.core.network.networking.ManualAuthorizationRequired
 import com.infomaniak.core.network.utils.ApiErrorCode.Companion.translateError
+import com.infomaniak.core.notifications.notifyCompat
 import com.infomaniak.core.sentry.SentryLog
 import com.infomaniak.drive.data.api.ApiRepository.uploadEmptyFile
 import com.infomaniak.drive.data.api.ApiRoutes.uploadChunkUrl
@@ -47,7 +48,6 @@ import com.infomaniak.drive.data.services.UploadWorker
 import com.infomaniak.drive.data.sync.UploadNotifications.progressPendingIntent
 import com.infomaniak.drive.utils.NotificationUtils.CURRENT_UPLOAD_ID
 import com.infomaniak.drive.utils.NotificationUtils.ELAPSED_TIME
-import com.infomaniak.drive.utils.NotificationUtils.notifyCompat
 import com.infomaniak.drive.utils.NotificationUtils.uploadProgressNotification
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.okhttp.OkHttp
@@ -115,7 +115,7 @@ class UploadTask(
         uploadNotification = context.uploadProgressNotification()
         uploadNotification.apply {
             setContentTitle(uploadFile.fileName)
-            notificationManagerCompat.notifyCompat(context, CURRENT_UPLOAD_ID, build())
+            notificationManagerCompat.notifyCompat(CURRENT_UPLOAD_ID, this)
         }
 
         try {
@@ -291,7 +291,7 @@ class UploadTask(
             setContentText("100%")
             setSmallIcon(android.R.drawable.stat_sys_upload_done)
             setProgress(0, 0, false)
-            notificationManagerCompat.notifyCompat(context, CURRENT_UPLOAD_ID, build())
+            notificationManagerCompat.notifyCompat(CURRENT_UPLOAD_ID, this)
         }
         shareProgress(100, true)
         UploadFile.uploadFinished(uri)
@@ -433,10 +433,10 @@ class UploadTask(
 
         if (uploadNotificationElapsedTime >= ELAPSED_TIME) {
             uploadNotification.apply {
-                setContentIntent(uploadFile.progressPendingIntent(context))
+                setContentIntent(uploadFile.progressPendingIntent())
                 setContentText("${progress}%")
                 setProgress(100, progress, false)
-                notificationManagerCompat.notifyCompat(context, CURRENT_UPLOAD_ID, build())
+                notificationManagerCompat.notifyCompat(CURRENT_UPLOAD_ID, this)
                 uploadNotificationStartTime = System.currentTimeMillis()
                 uploadNotificationElapsedTime = 0L
             }

app/src/main/java/com/infomaniak/drive/data/documentprovider/CloudStorageProvider.kt

@@ -40,6 +40,7 @@ import com.infomaniak.core.common.cancellable
 import com.infomaniak.core.legacy.utils.NotificationUtilsCore
 import com.infomaniak.core.network.api.ApiController
 import com.infomaniak.core.network.models.ApiResponse
+import com.infomaniak.core.notifications.notifyCompat
 import com.infomaniak.core.sentry.SentryLog
 import com.infomaniak.drive.R
 import com.infomaniak.drive.data.api.ApiRepository
@@ -57,7 +58,6 @@ import com.infomaniak.drive.utils.DownloadOfflineFileManager
 import com.infomaniak.drive.utils.IOFile
 import com.infomaniak.drive.utils.NotificationUtils.buildGeneralNotification
 import com.infomaniak.drive.utils.NotificationUtils.cancelNotification
-import com.infomaniak.drive.utils.NotificationUtils.notifyCompat
 import com.infomaniak.drive.utils.SyncUtils.syncImmediately
 import com.infomaniak.drive.utils.Utils
 import com.infomaniak.drive.utils.copyToCancellable
@@ -722,7 +722,7 @@ class CloudStorageProvider : DocumentsProvider() {
                             NotificationUtilsCore.PENDING_INTENT_FLAGS,
                         ),
                     )
-                    NotificationManagerCompat.from(context).notifyCompat(context, syncPermissionNotifId, build())
+                    NotificationManagerCompat.from(context).notifyCompat(syncPermissionNotifId, this)
                 }
             }
         }

app/src/main/java/com/infomaniak/drive/data/services/BulkOperationWorker.kt

@@ -31,10 +31,10 @@ import androidx.work.ListenableWorker
 import androidx.work.WorkerParameters
 import com.google.common.util.concurrent.ListenableFuture
 import com.infomaniak.core.legacy.utils.Utils.createRefreshTimer
+import com.infomaniak.core.notifications.notifyCompat
 import com.infomaniak.drive.data.models.ActionProgress
 import com.infomaniak.drive.data.models.BulkOperationType
 import com.infomaniak.drive.data.models.MqttNotification
-import com.infomaniak.drive.utils.NotificationUtils.notifyCompat
 import java.util.Date
 import java.util.UUID
 
@@ -99,9 +99,8 @@ class BulkOperationWorker(context: Context, workerParams: WorkerParameters) : Li
                     onOperationFinished()
                 } else {
                     notificationManagerCompat.notifyCompat(
-                        context = applicationContext,
                         notificationId = notificationId,
-                        build = createNotificationBuilder(notification.progress).build()
+                        builder = createNotificationBuilder(notification.progress)
                     )
                 }
             }

app/src/main/java/com/infomaniak/drive/data/services/UploadWorker.kt

@@ -41,6 +41,7 @@ import com.infomaniak.core.legacy.utils.getFileName
 import com.infomaniak.core.legacy.utils.getFileSize
 import com.infomaniak.core.legacy.utils.hasPermissions
 import com.infomaniak.core.network.api.ApiController.gson
+import com.infomaniak.core.notifications.notifyCompat
 import com.infomaniak.core.sentry.SentryLog
 import com.infomaniak.drive.R
 import com.infomaniak.drive.data.api.FileChunkSizeManager.AllowedFileSizeExceededException
@@ -61,7 +62,6 @@ import com.infomaniak.drive.utils.MediaFoldersProvider.VIDEO_BUCKET_ID
 import com.infomaniak.drive.utils.NotificationUtils
 import com.infomaniak.drive.utils.NotificationUtils.buildGeneralNotification
 import com.infomaniak.drive.utils.NotificationUtils.cancelNotification
-import com.infomaniak.drive.utils.NotificationUtils.notifyCompat
 import com.infomaniak.drive.utils.SyncUtils
 import com.infomaniak.drive.utils.getAvailableMemory
 import com.infomaniak.drive.utils.uri
@@ -373,7 +373,7 @@ class UploadWorker(appContext: Context, params: WorkerParameters) : CoroutineWor
     }
 
     private fun progressForegroundInfo(pendingCount: Int): ForegroundInfo {
-        val notification = UploadNotifications.getCurrentUploadNotification(applicationContext, pendingCount).build()
+        val notification = UploadNotifications.getCurrentUploadNotification(pendingCount).build()
         val foregroundInfo = when {
             SDK_INT >= 29 -> {
                 ForegroundInfo(
@@ -599,7 +599,7 @@ class UploadWorker(appContext: Context, params: WorkerParameters) : CoroutineWor
             buildGeneralNotification(getString(R.string.noSyncFolderNotificationTitle)).apply {
                 setContentText(getString(R.string.noSyncFolderNotificationDescription))
                 setContentIntent(pendingIntent)
-                notificationManagerCompat.notifyCompat(applicationContext, NotificationUtils.SYNC_CONFIG_ID, this.build())
+                notificationManagerCompat.notifyCompat(NotificationUtils.SYNC_CONFIG_ID, this)
             }
         }