Merge pull request #2086 from vector-im/feature/fix_event_read_elsewhere

Clear the notification when the event is read elsewhere
This commit is contained in:
Onuray Sahin 2020-09-10 13:24:57 +03:00 committed by GitHub
commit 926ff80525
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions

View file

@ -8,7 +8,7 @@ Improvements 🙌:
- Handle date formatting properly (show time am/pm if needed, display year when needed)
Bugfix 🐛:
-
- Clear the notification when the event is read elsewhere (#1822)
Translations 🗣:
-

View file

@ -130,14 +130,9 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
Timber.i("## onMessageReceivedInternal() : $data")
}
val eventId = data["event_id"]
val roomId = data["room_id"]
if (eventId == null || roomId == null) {
Timber.e("## onMessageReceivedInternal() missing eventId and/or roomId")
return
}
// update the badge counter
val unreadCount = data.get("unread")?.let { Integer.parseInt(it) } ?: 0
val unreadCount = data["unread"]?.let { Integer.parseInt(it) } ?: 0
BadgeProxy.updateBadgeCount(applicationContext, unreadCount)
val session = activeSessionHolder.getSafeActiveSession()
@ -145,6 +140,9 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
if (session == null) {
Timber.w("## Can't sync from push, no current session")
} else {
val eventId = data["event_id"]
val roomId = data["room_id"]
if (isEventAlreadyKnown(eventId, roomId)) {
Timber.i("Ignoring push, event already known")
} else {