Immutable NotifiableEvent models #4182
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Adding the room name to the invitation notification (if the room summary is available) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,6 @@ | |
| */ | ||
| package im.vector.app.features.notifications | ||
|
|
||
| import im.vector.app.BuildConfig | ||
| import im.vector.app.R | ||
| import im.vector.app.core.resources.StringProvider | ||
|
|
@@ -54,21 +53,19 @@ class NotifiableEventResolver @Inject constructor( | |
|
|
||
| // private val eventDisplay = RiotEventDisplay(context) | ||
|
|
||
| fun resolveEvent(event: Event/*, roomState: RoomState?, bingRule: PushRule?*/, session: Session, isNoisy: Boolean): NotifiableEvent? { | ||
| val roomID = event.roomId ?: return null | ||
| val eventId = event.eventId ?: return null | ||
| if (event.getClearType() == EventType.STATE_ROOM_MEMBER) { | ||
| return resolveStateRoomEvent(event, session, canBeReplaced = false, isNoisy = isNoisy) | ||
| } | ||
| val timelineEvent = session.getRoom(roomID)?.getTimeLineEvent(eventId) ?: return null | ||
| when (event.getClearType()) { | ||
| EventType.MESSAGE -> { | ||
| return resolveMessageEvent(timelineEvent, session, canBeReplaced = false, isNoisy = isNoisy) | ||
| } | ||
| EventType.ENCRYPTED -> { | ||
| return resolveMessageEvent(timelineEvent, session, canBeReplaced = false, isNoisy = isNoisy) | ||
| } | ||
| else -> { | ||
| // If the event can be displayed, display it as is | ||
|
|
@@ -85,12 +82,14 @@ class NotifiableEventResolver @Inject constructor( | |
| description = bodyPreview, | ||
| title = stringProvider.getString(R.string.notification_unknown_new_event), | ||
| soundName = null, | ||
| type = event.type, | ||
| canBeReplaced = false | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun resolveInMemoryEvent(session: Session, event: Event, canBeReplaced: Boolean): NotifiableEvent? { | ||
| if (event.getClearType() != EventType.MESSAGE) return null | ||
|
|
||
| // Ignore message edition | ||
|
|
@@ -114,24 +113,14 @@ class NotifiableEventResolver @Inject constructor( | |
| avatarUrl = user.avatarUrl | ||
| ) | ||
| ) | ||
|
Contributor
Author
There was a problem hiding this comment.
|
||
| resolveMessageEvent(timelineEvent, session, canBeReplaced = canBeReplaced, isNoisy = !notificationAction.soundName.isNullOrBlank()) | ||
| } else { | ||
| Timber.d("Matched push rule is set to not notify") | ||
| null | ||
| } | ||
| } | ||
|
|
||
| private fun resolveMessageEvent(event: TimelineEvent, session: Session, canBeReplaced: Boolean, isNoisy: Boolean): NotifiableEvent { | ||
| // The event only contains an eventId, and roomId (type is m.room.*) , we need to get the displayable content (names, avatar, text, etc...) | ||
| val room = session.getRoom(event.root.roomId!! /*roomID cannot be null*/) | ||
|
|
||
|
|
@@ -142,19 +131,19 @@ class NotifiableEventResolver @Inject constructor( | |
| val roomName = stringProvider.getString(R.string.notification_unknown_room_name) | ||
| val senderDisplayName = event.senderInfo.disambiguatedDisplayName | ||
|
|
||
| return NotifiableMessageEvent( | ||
| eventId = event.root.eventId!!, | ||
| editedEventId = event.getEditedEventId(), | ||
| canBeReplaced = canBeReplaced, | ||
| timestamp = event.root.originServerTs ?: 0, | ||
| noisy = isNoisy, | ||
| senderName = senderDisplayName, | ||
| senderId = event.root.senderId, | ||
| body = body.toString(), | ||
| roomId = event.root.roomId!!, | ||
| roomName = roomName, | ||
| matrixID = session.myUserId | ||
| ) | ||
| } else { | ||
| if (event.root.isEncrypted() && event.root.mxDecryptionResult == null) { | ||
| // TODO use a global event decryptor? attache to session and that listen to new sessionId? | ||
|
|
@@ -175,57 +164,56 @@ class NotifiableEventResolver @Inject constructor( | |
| val roomName = room.roomSummary()?.displayName ?: "" | ||
| val senderDisplayName = event.senderInfo.disambiguatedDisplayName | ||
|
|
||
| return NotifiableMessageEvent( | ||
| eventId = event.root.eventId!!, | ||
| editedEventId = event.getEditedEventId(), | ||
| canBeReplaced = canBeReplaced, | ||
| timestamp = event.root.originServerTs ?: 0, | ||
| noisy = isNoisy, | ||
| senderName = senderDisplayName, | ||
| senderId = event.root.senderId, | ||
| body = body, | ||
| roomId = event.root.roomId!!, | ||
| roomName = roomName, | ||
| roomIsDirect = room.roomSummary()?.isDirect ?: false, | ||
| roomAvatarPath = session.contentUrlResolver() | ||
| .resolveThumbnail(room.roomSummary()?.avatarUrl, | ||
| 250, | ||
| 250, | ||
| ContentUrlResolver.ThumbnailMethod.SCALE), | ||
| senderAvatarPath = session.contentUrlResolver() | ||
| .resolveThumbnail(event.senderInfo.avatarUrl, | ||
| 250, | ||
| 250, | ||
| ContentUrlResolver.ThumbnailMethod.SCALE), | ||
| matrixID = session.myUserId, | ||
| soundName = null | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private fun resolveStateRoomEvent(event: Event, session: Session, canBeReplaced: Boolean, isNoisy: Boolean): NotifiableEvent? { | ||
| val content = event.content?.toModel<RoomMemberContent>() ?: return null | ||
| val roomId = event.roomId ?: return null | ||
| val dName = event.senderId?.let { session.getRoomMember(it, roomId)?.displayName } | ||
| if (Membership.INVITE == content.membership) { | ||
| val roomSummary = session.getRoomSummary(roomId) | ||
|
Contributor
Author
There was a problem hiding this comment. the room name change is from #4230 (for next time I'll be sure to better highlight the merge ordering to avoid growing diffs) |
||
| val body = noticeEventFormatter.format(event, dName, isDm = roomSummary?.isDirect.orFalse()) | ||
| ?: stringProvider.getString(R.string.notification_new_invitation) | ||
| return InviteNotifiableEvent( | ||
| session.myUserId, | ||
| eventId = event.eventId!!, | ||
| editedEventId = null, | ||
| canBeReplaced = canBeReplaced, | ||
| roomId = roomId, | ||
| roomName = roomSummary?.displayName, | ||
| timestamp = event.originServerTs ?: 0, | ||
| noisy = isNoisy, | ||
| title = stringProvider.getString(R.string.notification_new_invitation), | ||
| description = body.toString(), | ||
| soundName = null, // will be set later | ||
|
Contributor
Author
There was a problem hiding this comment. this comment is a lie! the |
||
| type = event.getClearType() | ||
| ) | ||
| } else { | ||
| Timber.e("## unsupported notifiable event for eventId [${event.eventId}]") | ||
| if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this was unused, if we want it back we can retrieve it from the source control history
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the cleanup. In practice I think this code will be lost forever :), but anyway, this is not a big loss