Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed chat message notification not being dismissed when marking the chat room as read

Browse source
This commit is contained in:
Sylvain Berfini 2021-11-25 10:01:33 +01:00
parent 390f7b3dd3
commit 5119f93365
3 changed files with 44 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -24,5 +24,6 @@ linphone-sdk-android/*.aar
app/debug app/debug
app/release app/release
app/releaseAppBundle app/releaseAppBundle
app/releaseWithCrashlytics
keystore.properties keystore.properties
app/src/main/res/xml/contacts.xml app/src/main/res/xml/contacts.xml

3
app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt
View file

@ -87,9 +87,8 @@ class ChatBubbleActivity : GenericActivity() {
} }
// Workaround for the removed notification when a chat room is marked as read // Workaround for the removed notification when a chat room is marked as read
coreContext.notificationsManager.dismissNotificationUponReadChatRoom = false coreContext.notificationsManager.disableDismissNotificationUponReadForChatRoom(chatRoom)
chatRoom.markAsRead() chatRoom.markAsRead()
coreContext.notificationsManager.dismissNotificationUponReadChatRoom = true
viewModel = ViewModelProvider( viewModel = ViewModelProvider(
this, this,

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

@ -64,6 +64,7 @@ private class Notifiable(val notificationId: Int) {
var localIdentity: String? = null var localIdentity: String? = null
var myself: String? = null var myself: String? = null
var remoteAddress: String? = null var remoteAddress: String? = null
var dismissNotificationUponReadChatRoom: Boolean = true
} }
private class NotifiableMessage( private class NotifiableMessage(
@ -102,6 +103,7 @@ class NotificationsManager(private val context: Context) {
} }
private val chatNotificationsMap: HashMap<String, Notifiable> = HashMap() private val chatNotificationsMap: HashMap<String, Notifiable> = HashMap()
private val callNotificationsMap: HashMap<String, Notifiable> = HashMap() private val callNotificationsMap: HashMap<String, Notifiable> = HashMap()
private val previousChatNotifications: ArrayList<Int> = arrayListOf()
private var currentForegroundServiceNotificationId: Int = 0 private var currentForegroundServiceNotificationId: Int = 0
private var serviceNotification: Notification? = null private var serviceNotification: Notification? = null
@ -110,8 +112,6 @@ class NotificationsManager(private val context: Context) {
var currentlyDisplayedChatRoomAddress: String? = null var currentlyDisplayedChatRoomAddress: String? = null
var dismissNotificationUponReadChatRoom: Boolean = true
private val listener: CoreListenerStub = object : CoreListenerStub() { private val listener: CoreListenerStub = object : CoreListenerStub() {
override fun onCallStateChanged( override fun onCallStateChanged(
core: Core, core: Core,
@ -173,11 +173,18 @@ class NotificationsManager(private val context: Context) {
} }
override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) { override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
if (dismissNotificationUponReadChatRoom) { val address = chatRoom.peerAddress.asStringUriOnly()
Log.i("[Notifications Manager] Chat room [$chatRoom] has been marked as read, removing notification if any") val notifiable = chatNotificationsMap[address]
dismissChatNotification(chatRoom) if (notifiable != null) {
if (notifiable.dismissNotificationUponReadChatRoom) {
Log.i("[Notifications Manager] Chat room [$chatRoom] has been marked as read, removing notification if any")
dismissChatNotification(chatRoom)
} else {
Log.i("[Notifications Manager] Chat room [$chatRoom] has been marked as read, not removing notification, maybe because of a chat bubble?")
}
} else { } else {
Log.i("[Notifications Manager] Chat room [$chatRoom] has been marked as read, not removing notification, maybe because of a chat bubble?") Log.i("[Notifications Manager] Chat room [$chatRoom] has been marked as read but no notifiable found, removing notification if any")
dismissChatNotification(chatRoom)
} }
} }
} }
@ -203,11 +210,11 @@ class NotificationsManager(private val context: Context) {
displayReplyMessageNotification(message, notifiable) displayReplyMessageNotification(message, notifiable)
} else { } else {
Log.e("[Notifications Manager] Couldn't find notification for chat room $address") Log.e("[Notifications Manager] Couldn't find notification for chat room $address")
cancel(id) cancel(id, CHAT_TAG)
} }
} else if (state == ChatMessage.State.NotDelivered) { } else if (state == ChatMessage.State.NotDelivered) {
Log.e("[Notifications Manager] Reply wasn't delivered") Log.e("[Notifications Manager] Reply wasn't delivered")
cancel(id) cancel(id, CHAT_TAG)
} }
} }
} }
@ -219,7 +226,10 @@ class NotificationsManager(private val context: Context) {
for (notification in manager.activeNotifications) { for (notification in manager.activeNotifications) {
if (notification.tag == CALL_TAG) { if (notification.tag == CALL_TAG) {
Log.w("[Notifications Manager] Found existing call notification [${notification.id}], cancelling it") Log.w("[Notifications Manager] Found existing call notification [${notification.id}], cancelling it")
manager.cancel(notification.id) manager.cancel(CALL_TAG, notification.id)
} else if (notification.tag == CHAT_TAG) {
Log.i("[Notifications Manager] Found existing chat notification [${notification.id}]")
previousChatNotifications.add(notification.id)
} }
} }
} }
@ -240,7 +250,7 @@ class NotificationsManager(private val context: Context) {
} }
for (notifiable in callNotificationsMap.values) { for (notifiable in callNotificationsMap.values) {
notificationManager.cancel(notifiable.notificationId) notificationManager.cancel(CALL_TAG, notifiable.notificationId)
} }
stopForegroundNotification() stopForegroundNotification()
@ -252,9 +262,9 @@ class NotificationsManager(private val context: Context) {
notificationManager.notify(tag, id, notification) notificationManager.notify(tag, id, notification)
} }
fun cancel(id: Int) { fun cancel(id: Int, tag: String) {
Log.i("[Notifications Manager] Canceling $id") Log.i("[Notifications Manager] Canceling [$id] with tag [$tag]")
notificationManager.cancel(id) notificationManager.cancel(tag, id)
} }
fun resetChatNotificationCounterForSipUri(sipUri: String) { fun resetChatNotificationCounterForSipUri(sipUri: String) {
@ -510,7 +520,7 @@ class NotificationsManager(private val context: Context) {
} }
fun dismissMissedCallNotification() { fun dismissMissedCallNotification() {
cancel(MISSED_CALLS_NOTIF_ID) cancel(MISSED_CALLS_NOTIF_ID, MISSED_CALL_TAG)
} }
fun displayCallNotification(call: Call, useAsForeground: Boolean = false) { fun displayCallNotification(call: Call, useAsForeground: Boolean = false) {
@ -611,7 +621,7 @@ class NotificationsManager(private val context: Context) {
val address = call.remoteAddress.asStringUriOnly() val address = call.remoteAddress.asStringUriOnly()
val notifiable: Notifiable? = callNotificationsMap[address] val notifiable: Notifiable? = callNotificationsMap[address]
if (notifiable != null) { if (notifiable != null) {
cancel(notifiable.notificationId) cancel(notifiable.notificationId, CALL_TAG)
callNotificationsMap.remove(address) callNotificationsMap.remove(address)
} else { } else {
Log.w("[Notifications Manager] No notification found for call ${call.callLog.callId}") Log.w("[Notifications Manager] No notification found for call ${call.callLog.callId}")
@ -758,7 +768,23 @@ class NotificationsManager(private val context: Context) {
if (notifiable != null) { if (notifiable != null) {
Log.i("[Notifications Manager] Dismissing notification for chat room $room with id ${notifiable.notificationId}") Log.i("[Notifications Manager] Dismissing notification for chat room $room with id ${notifiable.notificationId}")
notifiable.messages.clear() notifiable.messages.clear()
cancel(notifiable.notificationId) cancel(notifiable.notificationId, CHAT_TAG)
} else {
val previousNotificationId = previousChatNotifications.find { id -> id == room.creationTime.toInt() }
if (previousNotificationId != null) {
Log.i("[Notifications Manager] Found previous notification with same ID [$previousNotificationId], canceling it")
cancel(previousNotificationId, CHAT_TAG)
}
}
}
fun disableDismissNotificationUponReadForChatRoom(chatRoom: ChatRoom) {
val address = chatRoom.peerAddress.asStringUriOnly()
val notifiable: Notifiable? = chatNotificationsMap[address]
if (notifiable != null) {
Log.i("[Notifications Manager] Prevent notification with id [${notifiable.notificationId}] from being dismissed when chat room will be marked as read")
notifiable.dismissNotificationUponReadChatRoom = false
chatNotificationsMap[address] = notifiable
} }
} }