From 9b22f2fad84af36abf6ea0a49e71b41e11184695 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 3 Apr 2018 13:49:47 +0200
Subject: [PATCH] Correctly sort hidden buffers
---
.../de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
index a56c56180..3964b0fc8 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
@@ -510,7 +510,12 @@ class QuasselViewModel : ViewModel() {
(!config.hideInactiveBuffers()) ||
it.bufferStatus != BufferStatus.OFFLINE ||
it.info.type.hasFlag(Buffer_Type.StatusBuffer)
- }.distinct()
+ }.let {
+ if (config.sortAlphabetically())
+ it.sortedBy { it.info.bufferName }
+ .sortedByDescending { it.hiddenState == BufferHiddenState.VISIBLE }
+ else it
+ }.distinctBy { it.info.bufferId }
)
}
}
--
GitLab