From 6d01a570fdcec11387614bb02612c81a4f149a7c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Jul 2019 16:44:30 +0200
Subject: [PATCH] Clear notification for a room left on another client

---
 CHANGES.md                                         |  1 +
 .../android/api/pushrules/PushRuleService.kt       |  1 +
 .../session/notification/DefaultPushRuleService.kt | 14 +++++++++++---
 .../notification/ProcessEventForPushTask.kt        |  4 ++++
 .../notifications/PushRuleTriggerListener.kt       |  4 ++++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 50cbb3e1..1ba5b11e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Other changes:
 Bugfix:
  - Edited message: link confusion when (edited) appears in body (#398)
  - Close detail room screen when the room is left with another client (#256)
+ - Clear notification for a room left on another client
 
 Translations:
  -
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt
index b00450b5..1fc37cd4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt
@@ -41,6 +41,7 @@ interface PushRuleService {
 
     interface PushRuleListener {
         fun onMatchRule(event: Event, actions: List<Action>)
+        fun onRoomLeft(roomId: String)
         fun batchFinish()
     }
 }
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt
index 5b21f0e5..7397f0ee 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt
@@ -20,12 +20,10 @@ import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.auth.data.SessionParams
 import im.vector.matrix.android.api.pushrules.Action
 import im.vector.matrix.android.api.pushrules.PushRuleService
-import im.vector.matrix.android.api.pushrules.rest.GetPushRulesResponse
 import im.vector.matrix.android.api.pushrules.rest.PushRule
 import im.vector.matrix.android.api.session.events.model.Event
 import im.vector.matrix.android.internal.database.mapper.PushRulesMapper
 import im.vector.matrix.android.internal.database.model.PushRulesEntity
-import im.vector.matrix.android.internal.database.model.PusherEntityFields
 import im.vector.matrix.android.internal.database.query.where
 import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.session.pushers.GetPushRulesTask
@@ -122,13 +120,23 @@ internal class DefaultPushRuleService @Inject constructor(
         }
     }
 
+    fun dispatchRoomLeft(roomid: String) {
+        try {
+            listeners.forEach {
+                it.onRoomLeft(roomid)
+            }
+        } catch (e: Throwable) {
+            Timber.e(e, "Error while dispatching room left")
+        }
+    }
+
     fun dispatchFinish() {
         try {
             listeners.forEach {
                 it.batchFinish()
             }
         } catch (e: Throwable) {
-
+            Timber.e(e, "Error while dispatching finish")
         }
     }
 }
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/ProcessEventForPushTask.kt
index fc6c8838..d196e563 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/ProcessEventForPushTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/ProcessEventForPushTask.kt
@@ -44,6 +44,10 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
 
     override suspend fun execute(params: ProcessEventForPushTask.Params): Try<Unit> {
         return Try {
+            // Handle left rooms
+            params.syncResponse.leave.keys.forEach {
+                defaultPushRuleService.dispatchRoomLeft(it)
+            }
             val newJoinEvents = params.syncResponse.join
                     .map { entries ->
                         entries.value.timeline?.events?.map { it.copy(roomId = entries.key) }
diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt b/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt
index 760128de..d404b64c 100644
--- a/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt
@@ -56,6 +56,10 @@ class PushRuleTriggerListener @Inject constructor(
         }
     }
 
+    override fun onRoomLeft(roomId: String) {
+        notificationDrawerManager.clearMessageEventOfRoom(roomId)
+    }
+
     override fun batchFinish() {
         notificationDrawerManager.refreshNotificationDrawer()
     }