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

Rename method.

Browse source
This commit is contained in:
Benoit Marty 2025-10-08 10:22:30 +02:00
parent a786f6a5e9
commit 908b359d51
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenter.kt
View file

@ -24,7 +24,7 @@ class AnnouncementPresenter(
@Composable
override fun present(): AnnouncementState {
val showSpaceAnnouncement by remember {
announcementStore.announcementStateFlow(Announcement.Space).map {
announcementStore.announcementStatusFlow(Announcement.Space).map {
it == AnnouncementStore.AnnouncementStatus.Show
}
}.collectAsState(false)

6
features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementService.kt
View file

@ -49,8 +49,8 @@ class DefaultAnnouncementService(
override fun announcementsToShowFlow(): Flow<List<Announcement>> {
return combine(
announcementStore.announcementStateFlow(Announcement.Space),
announcementStore.announcementStateFlow(Announcement.NewNotificationSound),
announcementStore.announcementStatusFlow(Announcement.Space),
announcementStore.announcementStatusFlow(Announcement.NewNotificationSound),
) { spaceAnnouncementStatus, newNotificationSoundStatus ->
buildList {
if (spaceAnnouncementStatus == AnnouncementStore.AnnouncementStatus.Show) {
@ -64,7 +64,7 @@ class DefaultAnnouncementService(
}
private suspend fun showSpaceAnnouncement() {
val currentValue = announcementStore.announcementStateFlow(Announcement.Space).first()
val currentValue = announcementStore.announcementStatusFlow(Announcement.Space).first()
if (currentValue == AnnouncementStore.AnnouncementStatus.NeverShown) {
announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStore.AnnouncementStatus.Show)
}

2
features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/AnnouncementStore.kt
View file

@ -16,7 +16,7 @@ interface AnnouncementStore {
status: AnnouncementStatus,
)
fun announcementStateFlow(
fun announcementStatusFlow(
announcement: Announcement,
): Flow<AnnouncementStatus>

2
features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/DefaultAnnouncementStore.kt
View file

@ -34,7 +34,7 @@ class DefaultAnnouncementStore(
}
}
override fun announcementStateFlow(announcement: Announcement): Flow<AnnouncementStore.AnnouncementStatus> {
override fun announcementStatusFlow(announcement: Announcement): Flow<AnnouncementStore.AnnouncementStatus> {
val key = announcement.toKey()
// For NewNotificationSound, a migration will set it to Show on application upgrade (see AppMigration08)
val defaultStatus = when (announcement) {