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

Rename DoAction to more specific RequestDisableOptimizations

Browse source
This commit is contained in:
Benoit Marty 2025-06-16 10:49:26 +02:00
parent cce2f339d9
commit 751f7e766c
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/BatteryOptimizationBanner.kt
View file

@ -30,7 +30,7 @@ internal fun BatteryOptimizationBanner(
description = stringResource(R.string.banner_battery_optimization_content_android), description = stringResource(R.string.banner_battery_optimization_content_android),
type = AnnouncementType.Actionable( type = AnnouncementType.Actionable(
actionText = stringResource(R.string.banner_battery_optimization_submit_android), actionText = stringResource(R.string.banner_battery_optimization_submit_android),
onActionClick = { state.eventSink(BatteryOptimizationEvents.DoAction) }, onActionClick = { state.eventSink(BatteryOptimizationEvents.RequestDisableOptimizations) },
onDismissClick = { state.eventSink(BatteryOptimizationEvents.Dismiss) }, onDismissClick = { state.eventSink(BatteryOptimizationEvents.Dismiss) },
), ),
) )

2
libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt
View file

@ -9,5 +9,5 @@ package io.element.android.libraries.push.api.battery
sealed interface BatteryOptimizationEvents { sealed interface BatteryOptimizationEvents {
data object Dismiss : BatteryOptimizationEvents data object Dismiss : BatteryOptimizationEvents
data object DoAction : BatteryOptimizationEvents data object RequestDisableOptimizations : BatteryOptimizationEvents
} }

2
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt
View file

@ -51,7 +51,7 @@ class BatteryOptimizationPresenter @Inject constructor(
BatteryOptimizationEvents.Dismiss -> coroutineScope.launch { BatteryOptimizationEvents.Dismiss -> coroutineScope.launch {
mutableBatteryOptimizationStore.onOptimizationBannerDismissed() mutableBatteryOptimizationStore.onOptimizationBannerDismissed()
} }
BatteryOptimizationEvents.DoAction -> { BatteryOptimizationEvents.RequestDisableOptimizations -> {
isRequestSent = true isRequestSent = true
if (batteryOptimization.requestDisablingBatteryOptimization().not()) { if (batteryOptimization.requestDisablingBatteryOptimization().not()) {
// If not able to perform the request, ensure that we do not display the banner again // If not able to perform the request, ensure that we do not display the banner again

4
libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt
View file

@ -123,7 +123,7 @@ class BatteryOptimizationPresenterTest {
assertThat(initialState.shouldDisplayBanner).isFalse() assertThat(initialState.shouldDisplayBanner).isFalse()
val displayedItem = awaitItem() val displayedItem = awaitItem()
assertThat(displayedItem.shouldDisplayBanner).isTrue() assertThat(displayedItem.shouldDisplayBanner).isTrue()
displayedItem.eventSink(BatteryOptimizationEvents.DoAction) displayedItem.eventSink(BatteryOptimizationEvents.RequestDisableOptimizations)
requestDisablingBatteryOptimizationResult.assertions().isCalledOnce() requestDisablingBatteryOptimizationResult.assertions().isCalledOnce()
onOptimizationBannerDismissedResult.assertions().isCalledOnce() onOptimizationBannerDismissedResult.assertions().isCalledOnce()
} }
@ -149,7 +149,7 @@ class BatteryOptimizationPresenterTest {
assertThat(initialState.shouldDisplayBanner).isFalse() assertThat(initialState.shouldDisplayBanner).isFalse()
val displayedItem = awaitItem() val displayedItem = awaitItem()
assertThat(displayedItem.shouldDisplayBanner).isTrue() assertThat(displayedItem.shouldDisplayBanner).isTrue()
displayedItem.eventSink(BatteryOptimizationEvents.DoAction) displayedItem.eventSink(BatteryOptimizationEvents.RequestDisableOptimizations)
requestDisablingBatteryOptimizationResult.assertions().isCalledOnce() requestDisablingBatteryOptimizationResult.assertions().isCalledOnce()
batteryOptimization.isIgnoringBatteryOptimizationsResult = true batteryOptimization.isIgnoringBatteryOptimizationsResult = true
lifeCycleOwner.givenState(Lifecycle.State.RESUMED) lifeCycleOwner.givenState(Lifecycle.State.RESUMED)