From 65a882fd5eafd6299b76fabd953b5197f1d4b1fc Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 17 Apr 2018 15:16:31 +0200
Subject: [PATCH] Fix a build issue
---
.../chat/buffers/BufferViewConfigFragment.kt | 69 ++++++++++---------
1 file changed, 35 insertions(+), 34 deletions(-)
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 477333655..de4aa99e0 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
@@ -210,43 +210,44 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
val (config, list) = info ?: Pair(null, emptyList())
val minimumActivity = config?.minimumActivity() ?: Buffer_Activity.NONE
val activities = activityList.associate { it.bufferId to it.filtered }
- activity?.runOnUiThread {
- listAdapter.submitList(list.asSequence().sortedBy { props ->
- !props.info.type.hasFlag(Buffer_Type.StatusBuffer)
- }.sortedBy { props ->
- props.network.networkName
- }.map { props ->
- val activity = props.activity - (activities[props.info.bufferId] ?: 0)
- BufferListItem(
- props.copy(
- activity = activity,
- description = ircFormatDeserializer.formatString(
- requireContext(),
- props.description.toString(),
- colorize = messageSettings.colorizeMirc
- ),
- bufferActivity = Buffer_Activity.of(
- when {
- props.highlights > 0 -> Buffer_Activity.Highlight
- activity.hasFlag(Message_Type.Plain) ||
- activity.hasFlag(Message_Type.Notice) ||
- activity.hasFlag(Message_Type.Action) -> Buffer_Activity.NewMessage
- activity.isNotEmpty() -> Buffer_Activity.OtherActivity
- else -> Buffer_Activity.NoActivity
- }
- )
+ val processedList = list.asSequence().sortedBy { props ->
+ !props.info.type.hasFlag(Buffer_Type.StatusBuffer)
+ }.sortedBy { props ->
+ props.network.networkName
+ }.map { props ->
+ val activity = props.activity - (activities[props.info.bufferId] ?: 0)
+ BufferListItem(
+ props.copy(
+ activity = activity,
+ description = ircFormatDeserializer.formatString(
+ requireContext(),
+ props.description.toString(),
+ colorize = messageSettings.colorizeMirc
),
- BufferState(
- networkExpanded = !collapsedNetworks.contains(props.network.networkId),
- selected = selected.info?.bufferId == props.info.bufferId
+ bufferActivity = Buffer_Activity.of(
+ when {
+ props.highlights > 0 -> Buffer_Activity.Highlight
+ activity.hasFlag(Message_Type.Plain) ||
+ activity.hasFlag(Message_Type.Notice) ||
+ activity.hasFlag(Message_Type.Action) -> Buffer_Activity.NewMessage
+ activity.isNotEmpty() -> Buffer_Activity.OtherActivity
+ else -> Buffer_Activity.NoActivity
+ }
)
+ ),
+ BufferState(
+ networkExpanded = !collapsedNetworks.contains(props.network.networkId),
+ selected = selected.info?.bufferId == props.info.bufferId
)
- }.filter { (props, state) ->
- props.info.type.hasFlag(BufferInfo.Type.StatusBuffer) || state.networkExpanded
- }.filter {
- minimumActivity.toInt() <= it.props.bufferActivity.toInt() ||
- it.props.info.type.hasFlag(Buffer_Type.StatusBuffer)
- }.toList())
+ )
+ }.filter { (props, state) ->
+ (props.info.type.hasFlag(BufferInfo.Type.StatusBuffer) || state.networkExpanded) &&
+ (minimumActivity.toInt() <= props.bufferActivity.toInt() ||
+ props.info.type.hasFlag(Buffer_Type.StatusBuffer))
+ }.toList()
+
+ activity?.runOnUiThread {
+ listAdapter.submitList(processedList)
}
}
}
--
GitLab