mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 19:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved notifications manager to remove notification when chat room has been read

Browse source
This commit is contained in:
Sylvain Berfini 2023-09-19 11:11:07 +02:00
parent 58b93a9fa9
commit cb6850f287
1 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -210,12 +210,21 @@ class NotificationsManager @MainThread constructor(private val context: Context)
Log.w("$TAG Original reaction not found in currently displayed notification")
}
}
@WorkerThread
override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
Log.i(
"$TAG Chat room [$chatRoom] has been marked as read, removing notification if any"
)
dismissChatNotification(chatRoom)
}
}
private var coreService: CoreForegroundService? = null
private val callNotificationsMap: HashMap<String, Notifiable> = HashMap()
private val chatNotificationsMap: HashMap<String, Notifiable> = HashMap()
private val previousChatNotifications: ArrayList<Int> = arrayListOf()
init {
createServiceChannel()
@ -229,6 +238,11 @@ class NotificationsManager @MainThread constructor(private val context: Context)
"$TAG Found existing (call?) notification [${notification.id}] without tag, cancelling it"
)
notificationManager.cancel(notification.id)
} else if (notification.tag == CHAT_TAG) {
Log.i(
"[Notifications Manager] Found existing chat notification [${notification.id}]"
)
previousChatNotifications.add(notification.id)
}
}
}
@ -540,7 +554,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
)
for (content in message.contents) {
/*if (content.isFile) { // TODO
/*if (content.isFile) { // TODO: show image in notif if possible
val path = content.filePath
if (path != null) {
val contentUri: Uri = FileUtils.getFilePath(context, path)
@ -741,6 +755,32 @@ class NotificationsManager @MainThread constructor(private val context: Context)
}
}
@WorkerThread
fun dismissChatNotification(chatRoom: ChatRoom): Boolean {
val address = chatRoom.peerAddress.asStringUriOnly()
val notifiable: Notifiable? = chatNotificationsMap[address]
if (notifiable != null) {
Log.i(
"$TAG Dismissing notification for chat room $chatRoom with id ${notifiable.notificationId}"
)
notifiable.messages.clear()
cancelNotification(notifiable.notificationId, CHAT_TAG)
return true
} else {
val previousNotificationId = previousChatNotifications.find { id ->
id == LinphoneUtils.getChatRoomId(chatRoom).hashCode()
}
if (previousNotificationId != null) {
Log.i(
"$TAG Found previous notification with same ID [$previousNotificationId], canceling it"
)
cancelNotification(previousNotificationId, CHAT_TAG)
return true
}
}
return false
}
@AnyThread
fun getCallDeclinePendingIntent(notifiable: Notifiable): PendingIntent {
val hangupIntent = Intent(context, NotificationBroadcastReceiver::class.java)
@ -828,7 +868,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
channel.enableLights(true)
channel.enableVibration(true)
channel.setShowBadge(true)
channel.setAllowBubbles(true)
channel.setAllowBubbles(false)
notificationManager.createNotificationChannel(channel)
}