ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 10:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7350 from hayaksi1/fix/5766-redaction-unknown-target

Browse Source 
Do not notify about a redaction whose target event is unknown
This commit is contained in:
Benoit Marty
2026-08-11 16:21:28 +02:00
committed by GitHub
parent bea89fee41 fec71aaf4d
commit 433f5d1d04
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt
+2 -2
View File
@@ -304,8 +304,8 @@ class DefaultNotifiableEventResolver(
// Note: this case will be handled below // Note: this case will be handled below
val redactedEventId = content.redactedEventId val redactedEventId = content.redactedEventId
if (redactedEventId == null) { if (redactedEventId == null) {
Timber.tag(loggerTag.value).d("redactedEventId is null.") Timber.tag(loggerTag.value).w("Ignoring redaction notification with no redactedEventId.")
throw NotificationResolverException.UnknownError("redactedEventId is null") throw NotificationResolverException.EventFilteredOut
} else { } else {
ResolvedPushEvent.Redaction( ResolvedPushEvent.Redaction(
sessionId = userId, sessionId = userId,
libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt
+2 -1
View File
@@ -822,7 +822,7 @@ class DefaultNotifiableEventResolverTest : RobolectricTest() {
} }
@Test @Test
fun `resolve RoomRedaction with null redactedEventId should return null`() = runTest { fun `resolve RoomRedaction with null redactedEventId is filtered out`() = runTest {
val sut = createDefaultNotifiableEventResolver( val sut = createDefaultNotifiableEventResolver(
notificationResult = Result.success( notificationResult = Result.success(
mapOf( mapOf(
@@ -838,6 +838,7 @@ class DefaultNotifiableEventResolverTest : RobolectricTest() {
val request = aPushRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, "firebase") val request = aPushRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, "firebase")
val result = sut.resolveEvents(A_SESSION_ID, listOf(request)) val result = sut.resolveEvents(A_SESSION_ID, listOf(request))
assertThat(result.getEvent(request)?.getOrNull()).isNull() assertThat(result.getEvent(request)?.getOrNull()).isNull()
assertThat(result.getEvent(request)?.exceptionOrNull()).isEqualTo(NotificationResolverException.EventFilteredOut)
} }
@Test @Test