Clean up app version check for activeNotifications

in NotificationReceiver
This commit is contained in:
Jays2Kings 2022-12-22 20:18:53 -05:00
parent 0844e624a0
commit 6853399876

View file

@ -6,7 +6,6 @@ import android.content.ClipData
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.os.Build
import android.os.Handler import android.os.Handler
import eu.kanade.tachiyomi.data.backup.BackupRestoreService import eu.kanade.tachiyomi.data.backup.BackupRestoreService
import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.DatabaseHelper
@ -350,18 +349,16 @@ class NotificationReceiver : BroadcastReceiver() {
groupId: Int? = groupId: Int? =
null, null,
) { ) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { val groupKey = context.notificationManager.activeNotifications.find {
val groupKey = context.notificationManager.activeNotifications.find { it.id == notificationId
it.id == notificationId }?.groupKey
}?.groupKey if (groupId != null && groupId != 0 && groupKey != null && groupKey.isNotEmpty()) {
if (groupId != null && groupId != 0 && groupKey != null && groupKey.isNotEmpty()) { val notifications = context.notificationManager.activeNotifications.filter {
val notifications = context.notificationManager.activeNotifications.filter { it.groupKey == groupKey
it.groupKey == groupKey }
} if (notifications.size == 2) {
if (notifications.size == 2) { context.notificationManager.cancel(groupId)
context.notificationManager.cancel(groupId) return
return
}
} }
} }
context.notificationManager.cancel(notificationId) context.notificationManager.cancel(notificationId)