From 7ff72d480ce2361f3f61e10cbe94855982052e47 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 31 Mar 2023 16:02:05 +0200
Subject: [PATCH] Protect call to getNotificationItem

---
 .../api/notification/NotificationService.kt   |  2 +-
 .../libraries/matrix/impl/RustMatrixClient.kt |  2 +-
 .../notification/RustNotificationService.kt   | 23 ++++++++++++-------
 .../notification/FakeNotificationService.kt   |  4 ++--
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationService.kt
index 2c1672d864..9dec0821a3 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationService.kt
@@ -17,5 +17,5 @@
 package io.element.android.libraries.matrix.api.notification
 
 interface NotificationService {
-    fun getNotification(userId: String, roomId: String, eventId: String): NotificationData?
+    suspend fun getNotification(userId: String, roomId: String, eventId: String): Result<NotificationData?>
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index bb4ec1c971..cd14b35fbc 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -68,7 +68,7 @@ class RustMatrixClient constructor(
         client = client,
         dispatchers = dispatchers,
     )
-    private val notificationService = RustNotificationService(baseDirectory)
+    private val notificationService = RustNotificationService(baseDirectory, dispatchers)
     private var slidingSyncUpdateJob: Job? = null
 
     private val clientDelegate = object : ClientDelegate {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt
index 27091c17ee..1197021161 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt
@@ -16,23 +16,30 @@
 
 package io.element.android.libraries.matrix.impl.notification
 
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.notification.NotificationData
 import io.element.android.libraries.matrix.api.notification.NotificationService
+import kotlinx.coroutines.withContext
 import java.io.File
 
 class RustNotificationService(
     private val baseDirectory: File,
+    private val dispatchers: CoroutineDispatchers,
 ) : NotificationService {
     private val notificationMapper: NotificationMapper = NotificationMapper()
 
-    override fun getNotification(userId: String, roomId: String, eventId: String): NotificationData? {
-        return org.matrix.rustcomponents.sdk.NotificationService(
-            basePath = File(baseDirectory, "sessions").absolutePath,
-            userId = userId
-        ).use {
-            // TODO Not implemented yet, see https://github.com/matrix-org/matrix-rust-sdk/issues/1628
-            it.getNotificationItem(roomId, eventId)?.let { notificationItem ->
-                notificationMapper.map(notificationItem)
+    override suspend fun getNotification(userId: String, roomId: String, eventId: String): Result<NotificationData?> {
+        return withContext(dispatchers.io) {
+            runCatching {
+                org.matrix.rustcomponents.sdk.NotificationService(
+                    basePath = File(baseDirectory, "sessions").absolutePath,
+                    userId = userId
+                ).use {
+                    // TODO Not implemented yet, see https://github.com/matrix-org/matrix-rust-sdk/issues/1628
+                    it.getNotificationItem(roomId, eventId)?.let { notificationItem ->
+                        notificationMapper.map(notificationItem)
+                    }
+                }
             }
         }
     }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/FakeNotificationService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/FakeNotificationService.kt
index a788e56f19..879a9694a3 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/FakeNotificationService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/FakeNotificationService.kt
@@ -20,7 +20,7 @@ import io.element.android.libraries.matrix.api.notification.NotificationData
 import io.element.android.libraries.matrix.api.notification.NotificationService
 
 class FakeNotificationService : NotificationService {
-    override fun getNotification(userId: String, roomId: String, eventId: String): NotificationData? {
-        return null
+    override suspend fun getNotification(userId: String, roomId: String, eventId: String): Result<NotificationData?> {
+        return Result.success(null)
     }
 }