Skip to content

Commit 980431f

Browse files
committed
#1576 fix: hiding home screen alerts works again
1 parent bbc8385 commit 980431f

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

app/src/main/java/io/github/sds100/keymapper/home/HomeViewModel.kt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,22 @@ class HomeViewModel(
136136
showAlertsUseCase.hideAlerts,
137137
showAlertsUseCase.isLoggingEnabled,
138138
) { isBatteryOptimised, serviceState, isHidden, isLoggingEnabled ->
139-
sequence {
139+
if (isHidden) {
140+
return@combine emptyList()
141+
}
142+
143+
buildList {
140144
when (serviceState) {
141145
ServiceState.CRASHED ->
142-
yield(
146+
add(
143147
HomeWarningListItem(
144148
ID_ACCESSIBILITY_SERVICE_CRASHED_LIST_ITEM,
145149
getString(R.string.home_error_accessibility_service_is_crashed),
146150
),
147151
)
148152

149153
ServiceState.DISABLED ->
150-
yield(
154+
add(
151155
HomeWarningListItem(
152156
ID_ACCESSIBILITY_SERVICE_DISABLED_LIST_ITEM,
153157
getString(R.string.home_error_accessibility_service_is_disabled),
@@ -158,7 +162,7 @@ class HomeViewModel(
158162
}
159163

160164
if (isBatteryOptimised) {
161-
yield(
165+
add(
162166
HomeWarningListItem(
163167
ID_BATTERY_OPTIMISATION_LIST_ITEM,
164168
getString(R.string.home_error_is_battery_optimised),
@@ -167,14 +171,14 @@ class HomeViewModel(
167171
} // don't show a success message for this
168172

169173
if (isLoggingEnabled) {
170-
yield(
174+
add(
171175
HomeWarningListItem(
172176
ID_LOGGING_ENABLED_LIST_ITEM,
173177
getString(R.string.home_error_logging_enabled),
174178
),
175179
)
176180
}
177-
}.toList()
181+
}
178182
}
179183

180184
val state: StateFlow<HomeState> =

0 commit comments

Comments
 (0)