filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-28 18:09:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5102 from vector-im/feature/adm/notification-logging

Browse Source 
Increased push rules logging
This commit is contained in:
Benoit Marty 2022-01-31 14:39:44 +01:00 committed by GitHub
commit f2d927079d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
View File

@ -74,6 +74,7 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
event to it event to it
} }
} }
Timber.d("[PushRules] matched ${matchedEvents.size} out of ${allEvents.size}")
val allRedactedEvents = params.syncResponse.join val allRedactedEvents = params.syncResponse.join
.asSequence() .asSequence()

11
vector/src/main/java/im/vector/app/features/notifications/NotifiableEventProcessor.kt
View File

@ -20,6 +20,7 @@ import im.vector.app.features.invite.AutoAcceptInvites
import im.vector.app.features.notifications.ProcessedEvent.Type.KEEP import im.vector.app.features.notifications.ProcessedEvent.Type.KEEP
import im.vector.app.features.notifications.ProcessedEvent.Type.REMOVE import im.vector.app.features.notifications.ProcessedEvent.Type.REMOVE
import org.matrix.android.sdk.api.session.events.model.EventType import org.matrix.android.sdk.api.session.events.model.EventType
import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
private typealias ProcessedEvents = List<ProcessedEvent<NotifiableEvent>> private typealias ProcessedEvents = List<ProcessedEvent<NotifiableEvent>>
@ -33,9 +34,13 @@ class NotifiableEventProcessor @Inject constructor(
val processedEvents = queuedEvents.map { val processedEvents = queuedEvents.map {
val type = when (it) { val type = when (it) {
is InviteNotifiableEvent -> if (autoAcceptInvites.hideInvites) REMOVE else KEEP is InviteNotifiableEvent -> if (autoAcceptInvites.hideInvites) REMOVE else KEEP
is NotifiableMessageEvent -> if (shouldIgnoreMessageEventInRoom(currentRoomId, it.roomId) || outdatedDetector.isMessageOutdated(it)) { is NotifiableMessageEvent -> when {
REMOVE shouldIgnoreMessageEventInRoom(currentRoomId, it.roomId) -> REMOVE
} else KEEP .also { Timber.d("notification message removed due to currently viewing the same room") }
outdatedDetector.isMessageOutdated(it) -> REMOVE
.also { Timber.d("notification message removed due to being read") }
else -> KEEP
}
is SimpleNotifiableEvent -> when (it.type) { is SimpleNotifiableEvent -> when (it.type) {
EventType.REDACTION -> REMOVE EventType.REDACTION -> REMOVE
else -> KEEP else -> KEEP

4
vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt
View File

@ -55,12 +55,12 @@ class PushRuleTriggerListener @Inject constructor(
private suspend fun createNotifiableEvents(pushEvents: PushEvents, session: Session): List<NotifiableEvent> { private suspend fun createNotifiableEvents(pushEvents: PushEvents, session: Session): List<NotifiableEvent> {
return pushEvents.matchedEvents.mapNotNull { (event, pushRule) -> return pushEvents.matchedEvents.mapNotNull { (event, pushRule) ->
Timber.v("Push rule match for event ${event.eventId}") Timber.d("Push rule match for event ${event.eventId}")
val action = pushRule.getActions().toNotificationAction() val action = pushRule.getActions().toNotificationAction()
if (action.shouldNotify) { if (action.shouldNotify) {
resolver.resolveEvent(event, session, isNoisy = !action.soundName.isNullOrBlank()) resolver.resolveEvent(event, session, isNoisy = !action.soundName.isNullOrBlank())
} else { } else {
Timber.v("Matched push rule is set to not notify") Timber.d("Matched push rule is set to not notify")
null null
} }
} }