Skip to content
Snippets Groups Projects
Commit 73ec3d12 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Attempt at fixing another hang

parent 79b359e3
No related branches found
No related tags found
No related merge requests found
package de.kuschku.libquassel.util.helpers
import de.kuschku.libquassel.util.Optional
import io.reactivex.Observable
fun <T> Observable<T>.or(default: T): T = try {
......@@ -9,4 +10,4 @@ fun <T> Observable<T>.or(default: T): T = try {
}
val <T> Observable<T>.value
get() = this.blockingLatest().firstOrNull()
\ No newline at end of file
get() = this.map { Optional.of(it) }.blockingMostRecent(Optional.empty()).firstOrNull()?.orNull()
\ No newline at end of file
......@@ -16,7 +16,6 @@ import de.kuschku.quasseldroid.util.helper.combineLatest
import de.kuschku.quasseldroid.util.helper.toLiveData
import de.kuschku.quasseldroid.viewmodel.data.*
import io.reactivex.Observable
import io.reactivex.functions.Function
import io.reactivex.subjects.BehaviorSubject
import java.util.concurrent.TimeUnit
......@@ -55,9 +54,9 @@ class QuasselViewModel : ViewModel() {
.map(Optional<BufferViewManager>::get)
val bufferViewConfig = bufferViewManager.switchMap { manager ->
bufferViewConfigId.map(Function<Int, Optional<BufferViewConfig>> { id ->
bufferViewConfigId.map { id ->
Optional.ofNullable(manager.bufferViewConfig(id))
})
}
}
val errors = session.switchMap(ISession::error)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment