Skip to content
Snippets Groups Projects
Verified Commit 3a726a03 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixes bug where the app would open the wrong buffer when resuming

parent 1e85b10f
No related branches found
No related tags found
No related merge requests found
Pipeline #
......@@ -176,22 +176,25 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
val info = session.bufferSyncer?.find(
bufferName = channel,
networkId = networkId,
type = Buffer_Type.of(Buffer_Type.QueryBuffer)
type = Buffer_Type.of(Buffer_Type.ChannelBuffer)
)
if (info != null) {
ChatActivity.launch(this, bufferId = info.bufferId)
viewModel.buffer.onNext(info.bufferId)
viewModel.bufferOpened.onNext(Unit)
} else {
viewModel.allBuffers.map {
listOfNotNull(it.find {
it.networkId == networkId && it.bufferName == channel
it.networkId == networkId &&
it.bufferName == channel &&
it.type.hasFlag(Buffer_Type.ChannelBuffer)
})
}.filter {
it.isNotEmpty()
}.firstElement().toLiveData().observe(this, Observer {
it?.firstOrNull()?.let { info ->
ChatActivity.launch(this, bufferId = info.bufferId)
viewModel.buffer.onNext(info.bufferId)
viewModel.bufferOpened.onNext(Unit)
}
})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment