mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-22 11:11:02 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

SettingsLiveData: post initial value even when it's null (#686)

Browse source
This commit is contained in:
Ricki Hirner 2024-03-28 09:44:19 +01:00 committed by GitHub
parent d0e5bbc0ad
commit 9b47427b66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/androidTest/kotlin/at/bitfire/davdroid/settings/SettingsManagerTest.kt
View file

@ -5,6 +5,7 @@
package at.bitfire.davdroid.settings
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.lifecycle.map
import at.bitfire.davdroid.TestUtils.getOrAwaitValue
import dagger.hilt.android.testing.HiltAndroidRule
import dagger.hilt.android.testing.HiltAndroidTest
@ -60,6 +61,20 @@ class SettingsManagerTest {
}
@Test
fun test_getBooleanLive_initialValuePostedEvenWhenNull() {
val live = settingsManager.getBooleanLive(SETTING_TEST).map { value ->
value
}
assertNull(live.getOrAwaitValue())
// posts value to main thread, InstantTaskExecutorRule is required to execute it instantly
settingsManager.putBoolean(SETTING_TEST, true)
runBlocking(Dispatchers.Main) { // observeForever can't be run in background thread
assertTrue(live.getOrAwaitValue()!!)
}
}
@Test
fun test_getBooleanLive_getValue() {
val live = settingsManager.getBooleanLive(SETTING_TEST)

4
app/src/main/kotlin/at/bitfire/davdroid/settings/SettingsManager.kt
View file

@ -178,6 +178,8 @@ class SettingsManager internal constructor(
inner class SettingLiveData<T>(
val getValueOrNull: () -> T?
): LiveData<T>(), OnChangeListener {
private var hasValue = false
override fun onActive() {
addOnChangeListener(this)
update()
@ -194,7 +196,7 @@ class SettingsManager internal constructor(
@Synchronized
private fun update() {
val newValue = getValueOrNull()
if (value != newValue)
if (!hasValue || value != newValue)
postValue(newValue)
}
}