Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Set the value of currentDistributorName by reading again the value from the service.

Browse source
This commit is contained in:
Benoit Marty 2024-05-28 13:55:29 +02:00
parent 8bb3b94132
commit 25c20f1734
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenter.kt
View file

@ -121,7 +121,6 @@ class NotificationSettingsPresenter @Inject constructor(
) )
.fold( .fold(
{ {
currentDistributorName = AsyncAction.Success(distributor.name)
refreshPushProvider++ refreshPushProvider++
}, },
{ {

1
features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenterTests.kt
View file

@ -262,6 +262,7 @@ class NotificationSettingsPresenterTests {
val withNewProvider = awaitItem() val withNewProvider = awaitItem()
assertThat(withNewProvider.showChangePushProviderDialog).isFalse() assertThat(withNewProvider.showChangePushProviderDialog).isFalse()
assertThat(withNewProvider.currentPushDistributor).isEqualTo(AsyncAction.Loading) assertThat(withNewProvider.currentPushDistributor).isEqualTo(AsyncAction.Loading)
skipItems(1)
val lastItem = awaitItem() val lastItem = awaitItem()
assertThat(lastItem.currentPushDistributor).isEqualTo(AsyncAction.Success("aDistributorName1")) assertThat(lastItem.currentPushDistributor).isEqualTo(AsyncAction.Success("aDistributorName1"))
cancelAndIgnoreRemainingEvents() cancelAndIgnoreRemainingEvents()

9
libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePushService.kt
View file

@ -30,19 +30,26 @@ class FakePushService(
}, },
) : PushService { ) : PushService {
override suspend fun getCurrentPushProvider(): PushProvider? { override suspend fun getCurrentPushProvider(): PushProvider? {
return availablePushProviders.firstOrNull() return registeredPushProvider ?: availablePushProviders.firstOrNull()
} }
override fun getAvailablePushProviders(): List<PushProvider> { override fun getAvailablePushProviders(): List<PushProvider> {
return availablePushProviders return availablePushProviders
} }
private var registeredPushProvider: PushProvider? = null
override suspend fun registerWith( override suspend fun registerWith(
matrixClient: MatrixClient, matrixClient: MatrixClient,
pushProvider: PushProvider, pushProvider: PushProvider,
distributor: Distributor, distributor: Distributor,
): Result<Unit> = simulateLongTask { ): Result<Unit> = simulateLongTask {
return registerWithLambda(matrixClient, pushProvider, distributor) return registerWithLambda(matrixClient, pushProvider, distributor)
.also {
if (it.isSuccess) {
registeredPushProvider = pushProvider
}
}
} }
override suspend fun testPush(): Boolean = simulateLongTask { override suspend fun testPush(): Boolean = simulateLongTask {