Inject NotificationManagerCompat where possible

Author: jmartinesp

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/SystemNotificationsEnabledProvider.kt

@@ -16,11 +16,9 @@
 
 package io.element.android.features.preferences.impl.notifications
 
-import android.content.Context
 import androidx.core.app.NotificationManagerCompat
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.di.SingleIn
 import javax.inject.Inject
 
@@ -31,9 +29,9 @@ interface SystemNotificationsEnabledProvider {
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class, boundType = SystemNotificationsEnabledProvider::class)
 class DefaultSystemNotificationsEnabledProvider @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
 ) : SystemNotificationsEnabledProvider {
     override fun notificationsEnabled(): Boolean {
-        return NotificationManagerCompat.from(context).areNotificationsEnabled()
+        return notificationManager.areNotificationsEnabled()
     }
 }

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDisplayer.kt

@@ -38,9 +38,8 @@ interface NotificationDisplayer {
 @ContributesBinding(AppScope::class)
 class DefaultNotificationDisplayer @Inject constructor(
     @ApplicationContext private val context: Context,
+    private val notificationManager: NotificationManagerCompat
 ) : NotificationDisplayer {
-    private val notificationManager = NotificationManagerCompat.from(context)
-
     override fun showNotificationMessage(tag: String?, id: Int, notification: Notification): Boolean {
         if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
             Timber.w("Not allowed to notify.")

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt

@@ -36,10 +36,9 @@ import javax.inject.Inject
 @SingleIn(AppScope::class)
 class NotificationChannels @Inject constructor(
     @ApplicationContext private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
     private val stringProvider: StringProvider,
 ) {
-    private val notificationManager = NotificationManagerCompat.from(context)
-
     init {
         createNotificationChannels()
     }

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt

@@ -199,7 +199,7 @@ class DefaultNotificationDrawerManagerTest {
             notificationManager = notificationManager,
             notificationRenderer = NotificationRenderer(
                 notificationIdProvider = NotificationIdProvider(),
-                notificationDisplayer = DefaultNotificationDisplayer(context),
+                notificationDisplayer = DefaultNotificationDisplayer(context, NotificationManagerCompat.from(context)),
                 notificationDataFactory = DefaultNotificationDataFactory(
                     notificationCreator = FakeNotificationCreator(),
                     roomGroupMessageCreator = roomGroupMessageCreator,

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt

@@ -20,6 +20,7 @@ import android.app.Notification
 import android.content.Context
 import android.os.Build
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
@@ -328,5 +329,5 @@ fun createNotificationCreator(
 
 fun createNotificationChannels(): NotificationChannels {
     val context = RuntimeEnvironment.getApplication()
-    return NotificationChannels(context, FakeStringProvider(""))
+    return NotificationChannels(context, NotificationManagerCompat.from(context), FakeStringProvider(""))
 }