Fix order of check to get notification status

element-hq · Nov 3, 2022 · e9daef9 · e9daef9
1 parent ac05e75
commit e9daef9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.../im/vector/app/features/settings/devices/v2/notification/GetNotificationsStatusUseCase.kt b/.../im/vector/app/features/settings/devices/v2/notification/GetNotificationsStatusUseCase.kt
@@ -38,14 +38,6 @@ class GetNotificationsStatusUseCase @Inject constructor(
         val session = activeSessionHolder.getSafeActiveSession()
         return when {
             session == null -> flowOf(NotificationsStatus.NOT_SUPPORTED)
-            checkIfCanTogglePushNotificationsViaPusherUseCase.execute() -> {
-                session.flow()
-                        .livePushers()
-                        .map { it.filter { pusher -> pusher.deviceId == deviceId } }
-                        .map { it.takeIf { it.isNotEmpty() }?.any { pusher -> pusher.enabled } }
-                        .map { if (it == true) NotificationsStatus.ENABLED else NotificationsStatus.DISABLED }
-                        .distinctUntilChanged()
-            }
             checkIfCanTogglePushNotificationsViaAccountDataUseCase.execute(deviceId) -> {
                 session.flow()
                         .liveUserAccountData(UserAccountDataTypes.TYPE_LOCAL_NOTIFICATION_SETTINGS + deviceId)
@@ -54,6 +46,14 @@ class GetNotificationsStatusUseCase @Inject constructor(
                         .map { if (it == true) NotificationsStatus.ENABLED else NotificationsStatus.DISABLED }
                         .distinctUntilChanged()
             }
+            checkIfCanTogglePushNotificationsViaPusherUseCase.execute() -> {
+                session.flow()
+                        .livePushers()
+                        .map { it.filter { pusher -> pusher.deviceId == deviceId } }
+                        .map { it.takeIf { it.isNotEmpty() }?.any { pusher -> pusher.enabled } }
+                        .map { if (it == true) NotificationsStatus.ENABLED else NotificationsStatus.DISABLED }
+                        .distinctUntilChanged()
+            }
             else -> flowOf(NotificationsStatus.NOT_SUPPORTED)
         }
     }

diff --git a/...vector/app/features/settings/devices/v2/notification/GetNotificationsStatusUseCaseTest.kt b/...vector/app/features/settings/devices/v2/notification/GetNotificationsStatusUseCaseTest.kt
@@ -22,6 +22,7 @@ import im.vector.app.test.fixtures.PusherFixture
 import im.vector.app.test.testDispatcher
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.verifyOrder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.test.resetMain
@@ -89,6 +90,11 @@ class GetNotificationsStatusUseCaseTest {
 
         // Then
         result.firstOrNull() shouldBeEqualTo NotificationsStatus.NOT_SUPPORTED
+        verifyOrder {
+            // we should first check account data
+            fakeCheckIfCanTogglePushNotificationsViaAccountDataUseCase.execute(A_DEVICE_ID)
+            fakeCheckIfCanTogglePushNotificationsViaPusherUseCase.execute()
+        }
     }
 
     @Test