devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adding < 28 notification support by using the inbox style

This commit is contained in:
Adam Brown 2022-03-17 19:51:19 +00:00
parent dbc915db58
commit c3839c05bc
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
features/notifications/src/main/kotlin/app/dapk/st/notifications/NotificationFactory.kt
View File

@ -4,6 +4,8 @@ import android.app.Notification
import android.app.PendingIntent import android.app.PendingIntent
import android.app.Person import android.app.Person
import android.content.Context import android.content.Context
import android.os.Build
import androidx.annotation.RequiresApi
import app.dapk.st.imageloader.IconLoader import app.dapk.st.imageloader.IconLoader
import app.dapk.st.matrix.sync.RoomEvent import app.dapk.st.matrix.sync.RoomEvent
import app.dapk.st.matrix.sync.RoomOverview import app.dapk.st.matrix.sync.RoomOverview
@ -46,7 +48,7 @@ class NotificationFactory(
} }
} }
return Notification.Builder(context, channelId) return builder()
.setStyle(summaryInboxStyle) .setStyle(summaryInboxStyle)
.setSmallIcon(R.drawable.ic_notification_small_icon) .setSmallIcon(R.drawable.ic_notification_small_icon)
.setCategory(Notification.CATEGORY_MESSAGE) .setCategory(Notification.CATEGORY_MESSAGE)
@ -55,7 +57,8 @@ class NotificationFactory(
.build() .build()
} }
private suspend fun createNotification(events: List<RoomEvent.Message>, roomOverview: RoomOverview): NotificationDelegate { @RequiresApi(Build.VERSION_CODES.P)
private suspend fun createMessageStyle(events: List<RoomEvent.Message>, roomOverview: RoomOverview): Notification.MessagingStyle {
val messageStyle = Notification.MessagingStyle( val messageStyle = Notification.MessagingStyle(
Person.Builder() Person.Builder()
.setName("me") .setName("me")
@ -66,7 +69,7 @@ class NotificationFactory(
messageStyle.conversationTitle = roomOverview.roomName.takeIf { roomOverview.isGroup } messageStyle.conversationTitle = roomOverview.roomName.takeIf { roomOverview.isGroup }
messageStyle.isGroupConversation = roomOverview.isGroup messageStyle.isGroupConversation = roomOverview.isGroup
events.sortedBy { it.utcTimestamp }.forEach { message -> events.forEach { message ->
val sender = Person.Builder() val sender = Person.Builder()
.setName(message.author.displayName ?: message.author.id.value) .setName(message.author.displayName ?: message.author.id.value)
.setIcon(message.author.avatarUrl?.let { iconLoader.load(it.value) }) .setIcon(message.author.avatarUrl?.let { iconLoader.load(it.value) })
@ -80,6 +83,21 @@ class NotificationFactory(
) )
) )
} }
return messageStyle
}
private suspend fun createNotification(events: List<RoomEvent.Message>, roomOverview: RoomOverview): NotificationDelegate {
val sortedEvents = events.sortedBy { it.utcTimestamp }
val messageStyle = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
createMessageStyle(sortedEvents, roomOverview)
} else {
val inboxStyle = Notification.InboxStyle()
events.forEach {
inboxStyle.addLine("${it.author.displayName ?: it.author.id.value}: ${it.content}")
}
inboxStyle
}
val openRoomIntent = PendingIntent.getActivity( val openRoomIntent = PendingIntent.getActivity(
context, context,
@ -89,25 +107,37 @@ class NotificationFactory(
) )
return NotificationDelegate.Room( return NotificationDelegate.Room(
Notification.Builder(context, channelId) builder()
.setWhen(messageStyle.messages.last().timestamp) .setWhen(sortedEvents.last().utcTimestamp)
.setShowWhen(true) .setShowWhen(true)
.setGroup(GROUP_ID) .setGroup(GROUP_ID)
.setOnlyAlertOnce(roomOverview.isGroup) .setOnlyAlertOnce(roomOverview.isGroup)
.setContentIntent(openRoomIntent) .setContentIntent(openRoomIntent)
.setStyle(messageStyle) .setStyle(messageStyle)
.setCategory(Notification.CATEGORY_MESSAGE) .setCategory(Notification.CATEGORY_MESSAGE)
.setShortcutId(roomOverview.roomId.value) .run {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
this.setShortcutId(roomOverview.roomId.value)
} else {
this
}
}
.setSmallIcon(R.drawable.ic_notification_small_icon) .setSmallIcon(R.drawable.ic_notification_small_icon)
.setLargeIcon(roomOverview.roomAvatarUrl?.let { iconLoader.load(it.value) }) .setLargeIcon(roomOverview.roomAvatarUrl?.let { iconLoader.load(it.value) })
.setAutoCancel(true) .setAutoCancel(true)
.build(), .build(),
roomId = roomOverview.roomId, roomId = roomOverview.roomId,
summary = messageStyle.messages.last().text.toString() summary = events.last().content
) )
} }
private fun builder() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
Notification.Builder(context, channelId)
} else {
Notification.Builder(context)
}
} }
data class Notifications(val summaryNotification: Notification?, val delegates: List<NotificationDelegate>) data class Notifications(val summaryNotification: Notification?, val delegates: List<NotificationDelegate>)