From 9b1e2ffbd67896ec07096424a47f96097824bbc7 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 25 Feb 2018 14:18:07 +0100
Subject: [PATCH] Adds missing file from previous-2 commit
---
.../quassel/syncables/BufferViewConfig.kt | 38 ++++++++++++-------
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt
index d5781d682..f3f69c2a6 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt
@@ -173,6 +173,9 @@ class BufferViewConfig constructor(
fun minimumActivity() = _minimumActivity
fun showSearch() = _showSearch
+ fun buffers(): List<BufferId> = _buffers
+ fun removedBuffers(): Set<BufferId> = _removedBuffers
+ fun temporarilyRemovedBuffers(): Set<BufferId> = _temporarilyRemovedBuffers
override fun setAddNewBuffersAutomatically(addNewBuffersAutomatically: Boolean) {
_addNewBuffersAutomatically = addNewBuffersAutomatically
@@ -250,25 +253,25 @@ class BufferViewConfig constructor(
private var _temporarilyRemovedBuffers: MutableSet<BufferId> = mutableSetOf()
val live_config = BehaviorSubject.createDefault(this)
- val live_buffers: BehaviorSubject<List<BufferId>>
- = BehaviorSubject.createDefault<List<BufferId>>(emptyList())
+ val live_buffers: BehaviorSubject<List<BufferId>> = BehaviorSubject.createDefault<List<BufferId>>(
+ emptyList()
+ )
- val live_removedBuffers: BehaviorSubject<Set<BufferId>>
- = BehaviorSubject.createDefault<Set<BufferId>>(emptySet())
+ val live_removedBuffers: BehaviorSubject<Set<BufferId>> = BehaviorSubject.createDefault<Set<BufferId>>(
+ emptySet()
+ )
- val live_temporarilyRemovedBuffers: BehaviorSubject<Set<BufferId>>
- = BehaviorSubject.createDefault<Set<BufferId>>(emptySet())
+ val live_temporarilyRemovedBuffers: BehaviorSubject<Set<BufferId>> = BehaviorSubject.createDefault<Set<BufferId>>(
+ emptySet()
+ )
object NameComparator : Comparator<BufferViewConfig> {
- override fun compare(a: BufferViewConfig?, b: BufferViewConfig?)
- = (a?.bufferViewName() ?: "").compareTo((b?.bufferViewName() ?: ""), true)
+ override fun compare(a: BufferViewConfig?, b: BufferViewConfig?) =
+ (a?.bufferViewName() ?: "").compareTo((b?.bufferViewName() ?: ""), true)
}
- fun handleBuffer(info: BufferInfo, bufferSyncer: BufferSyncer) {
- if (_addNewBuffersAutomatically &&
- !_buffers.contains(info.bufferId) &&
- !_temporarilyRemovedBuffers.contains(info.bufferId) &&
- !_removedBuffers.contains(info.bufferId)) {
+ fun requestAddBuffer(info: BufferInfo, bufferSyncer: BufferSyncer) {
+ if (!_buffers.contains(info.bufferId)) {
val position = if (_sortAlphabetically) {
val sortedBuffers = _buffers.mapNotNull { bufferSyncer.bufferInfo(it)?.bufferName }
-sortedBuffers.binarySearch(info.bufferName)
@@ -278,4 +281,13 @@ class BufferViewConfig constructor(
requestAddBuffer(info.bufferId, position)
}
}
+
+ fun handleBuffer(info: BufferInfo, bufferSyncer: BufferSyncer) {
+ if (_addNewBuffersAutomatically &&
+ !_buffers.contains(info.bufferId) &&
+ !_temporarilyRemovedBuffers.contains(info.bufferId) &&
+ !_removedBuffers.contains(info.bufferId)) {
+ requestAddBuffer(info, bufferSyncer)
+ }
+ }
}
--
GitLab