From 3d77083aa74d0daef25d24ab3eb787e461d1edad Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 24 May 2023 17:32:33 +0200 Subject: [PATCH] Cleanup --- .../libraries/matrix/api/notification/NotificationData.kt | 2 -- .../libraries/matrix/impl/notification/TimelineEventMapper.kt | 2 -- .../push/impl/notifications/NotifiableEventResolver.kt | 2 -- .../push/impl/notifications/model/NotifiableMessageEvent.kt | 3 +++ 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt index 60d889d046..eb6e9998ac 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt @@ -35,8 +35,6 @@ data class NotificationData( ) data class NotificationEvent( - val eventId: EventId, - val senderId: UserId, val timestamp: Long, val content: String, // For images for instance diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventMapper.kt index 3d2759c6d1..adb9dcce72 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventMapper.kt @@ -32,8 +32,6 @@ class TimelineEventMapper @Inject constructor() { fun map(timelineEvent: TimelineEvent): NotificationEvent { return timelineEvent.use { NotificationEvent( - eventId = EventId(it.eventId()), - senderId = UserId(it.senderId()), timestamp = it.timestamp().toLong(), content = it.eventType().toContent(), contentUrl = null // TODO it.eventType().toContentUrl(), diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolver.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolver.kt index 16abf69874..8e274b2124 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolver.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolver.kt @@ -114,8 +114,6 @@ private fun NotificationData?.orDefault(roomId: RoomId, eventId: EventId): Notif isEncrypted = false, isDirect = false, event = NotificationEvent( - eventId = eventId, - senderId = UserId("@user:domain"), timestamp = System.currentTimeMillis(), content = "Message ${eventId.value.take(8)}… in room ${roomId.value.take(8)}…", contentUrl = null diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt index d7af528ce3..1216e0fe12 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt @@ -57,6 +57,9 @@ data class NotifiableMessageEvent( val description: String = body ?: "" val title: String = senderName ?: "" + // TODO EAx The image has to be downloaded and expose using the file provider. + // Example of value from Element Android: + // content://im.vector.app.debug.mx-sdk.fileprovider/downloads/downloads/816abf76d806c768760568952b1862c8/F/72c33edd23dee3b95f4d5a18aa25fa54/image.png val imageUri: Uri? get() = imageUriString?.let { Uri.parse(it) } }