Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Benoit Marty 2023-04-14 10:32:20 +02:00
parent c84f6ea74f
commit 65717364ca
1 changed files with 11 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationUtils.kt
View file

@ -355,7 +355,6 @@ class NotificationUtils @Inject constructor(
inviteNotifiableEvent: InviteNotifiableEvent inviteNotifiableEvent: InviteNotifiableEvent
): Notification { ): Notification {
val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color) val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
// Build the pending intent for when the notification is clicked
val smallIcon = R.drawable.ic_notification val smallIcon = R.drawable.ic_notification
val channelID = if (inviteNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID val channelID = if (inviteNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
@ -407,6 +406,7 @@ class NotificationUtils @Inject constructor(
) )
/* /*
// Build the pending intent for when the notification is clicked
val contentIntent = HomeActivity.newIntent( val contentIntent = HomeActivity.newIntent(
context, context,
firstStartMainActivity = true, firstStartMainActivity = true,
@ -441,7 +441,6 @@ class NotificationUtils @Inject constructor(
simpleNotifiableEvent: SimpleNotifiableEvent, simpleNotifiableEvent: SimpleNotifiableEvent,
): Notification { ): Notification {
val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color) val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
// Build the pending intent for when the notification is clicked
val smallIcon = R.drawable.ic_notification val smallIcon = R.drawable.ic_notification
val channelID = if (simpleNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID val channelID = if (simpleNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
@ -455,14 +454,8 @@ class NotificationUtils @Inject constructor(
.setSmallIcon(smallIcon) .setSmallIcon(smallIcon)
.setColor(accentColor) .setColor(accentColor)
.setAutoCancel(true) .setAutoCancel(true)
.setContentIntent(buildOpenRoomIntent(simpleNotifiableEvent.sessionId, simpleNotifiableEvent.roomId))
.apply { .apply {
/* TODO EAx
val contentIntent = HomeActivity.newIntent(context, firstStartMainActivity = true)
contentIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
// pending intent get reused by system, this will mess up the extra params, so put unique info to avoid that
contentIntent.data = createIgnoredUri(simpleNotifiableEvent.eventId)
setContentIntent(PendingIntent.getActivity(context, 0, contentIntent, PendingIntentCompat.FLAG_IMMUTABLE))
*/
if (simpleNotifiableEvent.noisy) { if (simpleNotifiableEvent.noisy) {
// Compat // Compat
priority = NotificationCompat.PRIORITY_DEFAULT priority = NotificationCompat.PRIORITY_DEFAULT
@ -481,30 +474,20 @@ class NotificationUtils @Inject constructor(
.build() .build()
} }
private fun buildOpenSessionIntent(sessionId: SessionId): PendingIntent? {
return getPendingIntent(sessionId = sessionId, roomId = null, threadId = null)
}
private fun buildOpenRoomIntent(sessionId: SessionId, roomId: RoomId): PendingIntent? { private fun buildOpenRoomIntent(sessionId: SessionId, roomId: RoomId): PendingIntent? {
val intent = intentProvider.getViewIntent(sessionId = sessionId, roomId = roomId, threadId = null) return getPendingIntent(sessionId = sessionId, roomId = roomId, threadId = null)
return PendingIntent.getActivity(
context,
clock.epochMillis().toInt(),
intent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
} }
private fun buildOpenThreadIntent(roomInfo: RoomEventGroupInfo, threadId: ThreadId?): PendingIntent? { private fun buildOpenThreadIntent(roomInfo: RoomEventGroupInfo, threadId: ThreadId?): PendingIntent? {
val sessionId = roomInfo.sessionId return getPendingIntent(sessionId = roomInfo.sessionId, roomId = roomInfo.roomId, threadId = threadId)
val roomId = roomInfo.roomId
val intent = intentProvider.getViewIntent(sessionId = sessionId, roomId = roomId, threadId = threadId)
return PendingIntent.getActivity(
context,
clock.epochMillis().toInt(),
intent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
} }
private fun buildOpenHomePendingIntentForSummary(sessionId: SessionId): PendingIntent { private fun getPendingIntent(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?): PendingIntent? {
val intent = intentProvider.getViewIntent(sessionId = sessionId, roomId = null, threadId = null) val intent = intentProvider.getViewIntent(sessionId = sessionId, roomId = roomId, threadId = threadId)
return PendingIntent.getActivity( return PendingIntent.getActivity(
context, context,
clock.epochMillis().toInt(), clock.epochMillis().toInt(),
@ -567,7 +550,6 @@ class NotificationUtils @Inject constructor(
return null return null
} }
// // Number of new notifications for API <24 (M and below) devices.
/** /**
* Build the summary notification. * Build the summary notification.
*/ */
@ -610,7 +592,7 @@ class NotificationUtils @Inject constructor(
priority = NotificationCompat.PRIORITY_LOW priority = NotificationCompat.PRIORITY_LOW
} }
} }
.setContentIntent(buildOpenHomePendingIntentForSummary(sessionId)) .setContentIntent(buildOpenSessionIntent(sessionId))
.setDeleteIntent(getDismissSummaryPendingIntent(sessionId)) .setDeleteIntent(getDismissSummaryPendingIntent(sessionId))
.build() .build()
} }