ajp_anton/notifications-master
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Fix anchored notification visibility exceptions

Browse Source
This commit is contained in:
ajp_anton
2026-08-30 23:43:09 +00:00
parent 08f8764c77
commit 30753f1b6a
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/se/ajpanton/notificationsmaster/visibility/VisibilityPolicy.kt
+8 -4
View File
@@ -93,19 +93,23 @@ class CompiledVisibilityPolicy(policy: VisibilityPolicy) {
fun isBlocked(notification: VisibilityNotification, surface: NotificationSurface): Boolean { fun isBlocked(notification: VisibilityNotification, surface: NotificationSurface): Boolean {
if (!enabled) return false if (!enabled) return false
val policy = apps[notification.packageName] ?: return false val policy = apps[notification.packageName] ?: return false
val matchText = notification.matchText() val matchTexts = notification.matchTexts()
val exception = policy.exceptions.firstOrNull { it.pattern.matcher(matchText).find() } val exception = policy.exceptions.firstOrNull { rule ->
matchTexts.any { rule.pattern.matcher(it).find() }
}
return surface in (exception?.blockedSurfaces ?: policy.blockedSurfaces) return surface in (exception?.blockedSurfaces ?: policy.blockedSurfaces)
} }
fun hasExceptions(packageName: String) = apps[packageName]?.exceptions?.isNotEmpty() == true fun hasExceptions(packageName: String) = apps[packageName]?.exceptions?.isNotEmpty() == true
private fun VisibilityNotification.matchText() = buildList { private fun VisibilityNotification.matchTexts() = buildList {
add(packageName) add(packageName)
add(key) add(key)
listOf(title, text, bigText, subtext, channelId).filterNotNullTo(this) listOf(title, text, bigText, subtext, channelId).filterNotNullTo(this)
addAll(messages) addAll(messages)
}.joinToString("\n") }.map(String::trim).filter(String::isNotEmpty).let { fields ->
fields + fields.joinToString("\n")
}
private data class CompiledAppPolicy( private data class CompiledAppPolicy(
val blockedSurfaces: Set<NotificationSurface>, val blockedSurfaces: Set<NotificationSurface>,
app/src/test/java/se/ajpanton/notificationsmaster/visibility/VisibilityPolicyTest.kt
+8
View File
@@ -61,6 +61,14 @@ class VisibilityPolicyTest {
} }
} }
@Test fun `anchors apply to each notification field`() {
val policy = compiled(exceptions = listOf(
VisibilityExceptionRule("^Lunch tomorrow\\?$", setOf(NotificationSurface.AOD)),
))
assertTrue(policy.isBlocked(notification, NotificationSurface.AOD))
}
@Test fun `invalid regular expressions can be rejected by an editor`() { @Test fun `invalid regular expressions can be rejected by an editor`() {
assertFalse(VisibilityExceptionRule("(", emptySet()).hasValidPattern()) assertFalse(VisibilityExceptionRule("(", emptySet()).hasValidPattern())
assertTrue(VisibilityExceptionRule("valid.*", emptySet()).hasValidPattern()) assertTrue(VisibilityExceptionRule("valid.*", emptySet()).hasValidPattern())