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

Improve API: use RoomId instead of String.

Browse source
This commit is contained in:
Benoit Marty 2025-11-19 10:07:34 +01:00
parent ddf76d818a
commit dc65191e2c
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notificationsettings/NotificationSettingsService.kt
View file

@ -32,7 +32,7 @@ interface NotificationSettingsService {
suspend fun setCallEnabled(enabled: Boolean): Result<Unit>
suspend fun isInviteForMeEnabled(): Result<Boolean>
suspend fun setInviteForMeEnabled(enabled: Boolean): Result<Unit>
suspend fun getRoomsWithUserDefinedRules(): Result<List<String>>
suspend fun getRoomsWithUserDefinedRules(): Result<List<RoomId>>
suspend fun canHomeServerPushEncryptedEventsToDevice(): Result<Boolean>
suspend fun getRawPushRules(): Result<String?>
}

4
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt
View file

@ -131,9 +131,9 @@ class RustNotificationSettingsService(
}
}
override suspend fun getRoomsWithUserDefinedRules(): Result<List<String>> =
override suspend fun getRoomsWithUserDefinedRules(): Result<List<RoomId>> =
runCatchingExceptions {
notificationSettings.await().getRoomsWithUserDefinedRules(enabled = true)
notificationSettings.await().getRoomsWithUserDefinedRules(enabled = true).map(::RoomId)
}
override suspend fun canHomeServerPushEncryptedEventsToDevice(): Result<Boolean> =

4
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notificationsettings/FakeNotificationSettingsService.kt
View file

@ -25,7 +25,7 @@ class FakeNotificationSettingsService(
initialOneToOneDefaultMode: RoomNotificationMode = RoomNotificationMode.ALL_MESSAGES,
initialEncryptedOneToOneDefaultMode: RoomNotificationMode = RoomNotificationMode.ALL_MESSAGES,
private val getRawPushRulesResult: () -> Result<String> = { lambdaError() },
private val getRoomsWithUserDefinedRulesResult: () -> Result<List<String>> = { lambdaError() },
private val getRoomsWithUserDefinedRulesResult: () -> Result<List<RoomId>> = { lambdaError() },
) : NotificationSettingsService {
private val notificationSettingsStateFlow = MutableStateFlow(Unit)
private var defaultGroupRoomNotificationMode: RoomNotificationMode = initialGroupDefaultMode
@ -154,7 +154,7 @@ class FakeNotificationSettingsService(
return Result.success(Unit)
}
override suspend fun getRoomsWithUserDefinedRules(): Result<List<String>> {
override suspend fun getRoomsWithUserDefinedRules(): Result<List<RoomId>> {
return getRoomsWithUserDefinedRulesResult()
}