mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 12:07:28 +00:00
Rename DoAction to more specific RequestDisableOptimizations
This commit is contained in:
+1
-1
@@ -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) },
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|||||||
+1
-1
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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
|
||||||
|
|||||||
+2
-2
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user