chore(fc): properly use injected NotificationManager

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/inject/AppModule.kt

@@ -1,7 +1,6 @@
 package xyz.flipchat.app.inject
 
 import android.annotation.SuppressLint
-import android.app.NotificationManager
 import android.content.ClipboardManager
 import android.content.Context
 import android.net.ConnectivityManager

flipchatApp/src/main/kotlin/xyz/flipchat/app/services/FcNotificationService.kt

@@ -1,14 +1,18 @@
 package xyz.flipchat.app.services
 
+import android.Manifest
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.media.RingtoneManager
 import android.os.Build
+import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.Person
 import com.getcode.model.ID
 import com.getcode.ui.components.chat.utils.localizedText
@@ -62,6 +66,9 @@ class FcNotificationService : FirebaseMessagingService(),
     @Inject
     lateinit var currencyUtils: CurrencyUtils
 
+    @Inject
+    lateinit var notificationManager: NotificationManagerCompat
+
     override fun onMessageReceived(message: RemoteMessage) {
         super.onMessageReceived(message)
         authenticateIfNeeded { handleMessage(message) }
@@ -138,9 +145,6 @@ class FcNotificationService : FirebaseMessagingService(),
         title: String,
         content: String,
     ) {
-        val notificationManager =
-            getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             notificationManager.createNotificationChannel(
                 NotificationChannel(
@@ -179,21 +183,35 @@ class FcNotificationService : FirebaseMessagingService(),
                 .setAutoCancel(true)
                 .setContentIntent(buildContentIntent(type))
 
-        notificationManager.notify(title.hashCode(), notificationBuilder.build())
-
-        trace(
-            tag = "Push",
-            message = "Push notification shown",
-            metadata = {
-                "category" to type.name
-            },
-            type = TraceType.Process
-        )
+        if (ActivityCompat.checkSelfPermission(
+                this,
+                Manifest.permission.POST_NOTIFICATIONS
+            ) == PackageManager.PERMISSION_GRANTED
+        ) {
+            notificationManager.notify(title.hashCode(), notificationBuilder.build())
+            trace(
+                tag = "Push",
+                message = "Push notification shown",
+                metadata = {
+                    "category" to type.name
+                },
+                type = TraceType.Process
+            )
+        } else {
+            trace(
+                tag = "Push",
+                message = "Push notification NOT shown - missing permission",
+                metadata = {
+                    "category" to type.name
+                },
+                type = TraceType.Process
+            )
+        }
     }
 }
 
-private fun NotificationManager.getActiveNotification(notificationId: Int): Notification? {
-    val barNotifications = getActiveNotifications()
+private fun NotificationManagerCompat.getActiveNotification(notificationId: Int): Notification? {
+    val barNotifications = activeNotifications
     for (notification in barNotifications) {
         if (notification.id == notificationId) {
             return notification.notification
@@ -202,24 +220,6 @@ private fun NotificationManager.getActiveNotification(notificationId: Int): Noti
     return null
 }
 
-fun NotificationManager.getRoomNotifications(roomId: ID, roomName: String): List<Notification> {
-    val barNotifications = getActiveNotifications()
-    val roomNotifications = barNotifications.mapNotNull { notification ->
-        val roomIdHash = roomId.base58.hashCode()
-        val roomNameHash = roomName.hashCode()
-
-        val isMatch = notification.id == roomIdHash || notification.id == roomNameHash
-
-        if (isMatch) {
-            notification.notification
-        } else {
-            null
-        }
-    }
-
-    return roomNotifications
-}
-
 private fun Context.buildContentIntent(type: FcNotificationType): PendingIntent {
     val launchIntent = when (type) {
         is FcNotificationType.ChatMessage -> Intent("https://app.flipchat.xyz/chat/${type.id?.base58}")

services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/RoomController.kt

@@ -1,6 +1,7 @@
 package xyz.flipchat.chat
 
 import android.app.NotificationManager
+import androidx.core.app.NotificationManagerCompat
 import androidx.paging.ExperimentalPagingApi
 import androidx.paging.LoadType
 import androidx.paging.Pager
@@ -36,7 +37,7 @@ class RoomController @Inject constructor(
     private val messagingRepository: MessagingRepository,
     private val conversationMemberMapper: ConversationMemberMapper,
     private val conversationMessageWithContentMapper: ConversationMessageWithContentMapper,
-    private val notificationManager: NotificationManager,
+    private val notificationManager: NotificationManagerCompat,
 ) {
     private val db: FcAppDatabase
         get() = FcAppDatabase.requireInstance()

services/flipchat/sdk/src/main/kotlin/xyz/flipchat/notifications/NotificationManager.kt

@@ -1,11 +1,11 @@
 package xyz.flipchat.notifications
 
-import android.app.NotificationManager
+import androidx.core.app.NotificationManagerCompat
 import com.getcode.model.ID
 import com.getcode.utils.base58
 
-fun NotificationManager.getRoomNotifications(roomId: ID, roomName: String): List<Int> {
-    val barNotifications = getActiveNotifications()
+fun NotificationManagerCompat.getRoomNotifications(roomId: ID, roomName: String): List<Int> {
+    val barNotifications = activeNotifications
     val roomNotifications = barNotifications.mapNotNull { notification ->
         val roomIdHash = roomId.base58.hashCode()
         val roomNameHash = roomName.hashCode()