From 1cbdb4019d3be3a372cbad94ed504c249cd1c3ad Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Thu, 7 Jun 2018 23:36:24 +0200 Subject: [PATCH] Fixes #122 entirely --- .../quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt index ddbdbdbb5..06e0494ae 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt @@ -37,6 +37,7 @@ import de.kuschku.libquassel.quassel.syncables.BufferViewConfig import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork import de.kuschku.libquassel.util.flag.hasFlag import de.kuschku.libquassel.util.flag.minus +import de.kuschku.libquassel.util.helpers.nullIf import de.kuschku.libquassel.util.helpers.value import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.persistence.QuasselDatabase @@ -230,7 +231,8 @@ class BufferViewConfigFragment : ServiceBoundFragment() { hasRestoredSpinnerState = true } if (!hasSetBufferViewConfigId) { - chatListSpinner.setSelection(adapter.indexOf(viewModel.bufferViewConfigId.value)) + chatListSpinner.setSelection(adapter.indexOf(viewModel.bufferViewConfigId.value).nullIf { it == -1 } + ?: 0) viewModel.bufferViewConfigId.onNext(chatListSpinner.selectedItemId.toInt()) hasSetBufferViewConfigId = true } -- GitLab