From b361616e898498cb7fec33a62616e5d27f8d0df4 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Mon, 11 Jun 2018 13:44:10 +0200
Subject: [PATCH] Minor fixes and cleanup
---
.../quasseldroid/util/AvatarHelperTest.kt | 3 ++
.../quassel/syncables/BacklogManager.kt | 42 ++++++++-----------
.../de/kuschku/libquassel/session/Session.kt | 2 +-
3 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/app/src/test/java/de/kuschku/quasseldroid/util/AvatarHelperTest.kt b/app/src/test/java/de/kuschku/quasseldroid/util/AvatarHelperTest.kt
index b708b06ba..ad88daca8 100644
--- a/app/src/test/java/de/kuschku/quasseldroid/util/AvatarHelperTest.kt
+++ b/app/src/test/java/de/kuschku/quasseldroid/util/AvatarHelperTest.kt
@@ -37,6 +37,7 @@ class AvatarHelperTest {
type = Message_Type.of(Message_Type.Plain),
flag = Message_Flag.of(),
bufferId = 0,
+ networkId = 0,
sender = "justJanne",
senderPrefixes = "",
realName = "Janne Koschinski <janne@kuschku.de>",
@@ -76,6 +77,7 @@ class AvatarHelperTest {
type = Message_Type.of(Message_Type.Plain),
flag = Message_Flag.of(),
bufferId = 0,
+ networkId = 0,
sender = "jwheare!sid2@irccloud.com",
senderPrefixes = "",
realName = "James Wheare",
@@ -115,6 +117,7 @@ class AvatarHelperTest {
type = Message_Type.of(Message_Type.Plain),
flag = Message_Flag.of(),
bufferId = 0,
+ networkId = 0,
sender = "jwheare!sid2@irccloud.com",
senderPrefixes = "",
realName = "James Wheare",
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BacklogManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BacklogManager.kt
index 442f2e807..b12fef472 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BacklogManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BacklogManager.kt
@@ -22,18 +22,16 @@ package de.kuschku.libquassel.quassel.syncables
import de.kuschku.libquassel.protocol.*
import de.kuschku.libquassel.quassel.syncables.interfaces.IBacklogManager
import de.kuschku.libquassel.session.BacklogStorage
-import de.kuschku.libquassel.session.NotificationManager
import de.kuschku.libquassel.session.Session
import de.kuschku.libquassel.util.compatibility.LoggingHandler.Companion.log
import de.kuschku.libquassel.util.compatibility.LoggingHandler.LogLevel.ERROR
class BacklogManager(
private val session: Session,
- private val notificationManager: NotificationManager?,
private val backlogStorage: BacklogStorage
) : SyncableObject(session, "BacklogManager"), IBacklogManager {
- private val loading = mutableMapOf<BufferId, (List<Message>) -> Boolean>()
- private val loadingFiltered = mutableMapOf<BufferId, (List<Message>) -> Boolean>()
+ private val loading = mutableMapOf<BufferId, (List<Message>) -> Unit>()
+ private val loadingFiltered = mutableMapOf<BufferId, (List<Message>) -> Unit>()
init {
initialized = true
@@ -42,7 +40,7 @@ class BacklogManager(
fun updateIgnoreRules() = backlogStorage.updateIgnoreRules(session)
fun requestBacklog(bufferId: BufferId, first: MsgId = -1, last: MsgId = -1, limit: Int = -1,
- additional: Int = 0, callback: (List<Message>) -> Boolean) {
+ additional: Int = 0, callback: (List<Message>) -> Unit) {
if (loading.contains(bufferId)) return
loading[bufferId] = callback
requestBacklog(bufferId, first, last, limit, additional)
@@ -50,14 +48,14 @@ class BacklogManager(
fun requestBacklogFiltered(bufferId: BufferId, first: MsgId = -1, last: MsgId = -1,
limit: Int = -1, additional: Int = 0, type: Int = -1, flags: Int = -1,
- callback: (List<Message>) -> Boolean) {
+ callback: (List<Message>) -> Unit) {
if (loadingFiltered.contains(bufferId)) return
loadingFiltered[bufferId] = callback
requestBacklogFiltered(bufferId, first, last, limit, additional, type, flags)
}
fun requestBacklogAll(first: MsgId = -1, last: MsgId = -1, limit: Int = -1, additional: Int = 0,
- callback: (List<Message>) -> Boolean) {
+ callback: (List<Message>) -> Unit) {
if (loading.contains(-1)) return
loading[-1] = callback
requestBacklogAll(first, last, limit, additional)
@@ -65,7 +63,7 @@ class BacklogManager(
fun requestBacklogAllFiltered(first: MsgId = -1, last: MsgId = -1, limit: Int = -1,
additional: Int = 0, type: Int = -1, flags: Int = -1,
- callback: (List<Message>) -> Boolean) {
+ callback: (List<Message>) -> Unit) {
if (loading.contains(-1)) return
loadingFiltered[-1] = callback
requestBacklogAllFiltered(first, last, limit, additional, type, flags)
@@ -74,38 +72,34 @@ class BacklogManager(
override fun receiveBacklog(bufferId: BufferId, first: MsgId, last: MsgId, limit: Int,
additional: Int, messages: QVariantList) {
val list = messages.mapNotNull<QVariant_, Message>(QVariant_::value)
- if (loading.remove(bufferId)?.invoke(list) == true) {
- log(ERROR, "BacklogManager", "storeMessages(${list.size})")
- backlogStorage.storeMessages(session, list)
- }
+ loading.remove(bufferId)?.invoke(list)
+ log(ERROR, "BacklogManager", "storeMessages(${list.size})")
+ backlogStorage.storeMessages(session, list)
}
override fun receiveBacklogAll(first: MsgId, last: MsgId, limit: Int, additional: Int,
messages: QVariantList) {
val list = messages.mapNotNull<QVariant_, Message>(QVariant_::value)
- if (loading.remove(-1)?.invoke(list) == true) {
- log(ERROR, "BacklogManager", "storeMessages(${list.size})")
- backlogStorage.storeMessages(session, list)
- }
+ loading.remove(-1)?.invoke(list)
+ log(ERROR, "BacklogManager", "storeMessages(${list.size})")
+ backlogStorage.storeMessages(session, list)
}
override fun receiveBacklogFiltered(bufferId: BufferId, first: MsgId, last: MsgId, limit: Int,
additional: Int, type: Int, flags: Int,
messages: QVariantList) {
val list = messages.mapNotNull<QVariant_, Message>(QVariant_::value)
- if (loadingFiltered.remove(bufferId)?.invoke(list) == true) {
- log(ERROR, "BacklogManager", "storeMessages(${list.size})")
- backlogStorage.storeMessages(session, list)
- }
+ loadingFiltered.remove(bufferId)?.invoke(list)
+ log(ERROR, "BacklogManager", "storeMessages(${list.size})")
+ backlogStorage.storeMessages(session, list)
}
override fun receiveBacklogAllFiltered(first: MsgId, last: MsgId, limit: Int, additional: Int,
type: Int, flags: Int, messages: QVariantList) {
val list = messages.mapNotNull<QVariant_, Message>(QVariant_::value)
- if (loadingFiltered.remove(-1)?.invoke(list) == true) {
- log(ERROR, "BacklogManager", "storeMessages(${list.size})")
- backlogStorage.storeMessages(session, list)
- }
+ loadingFiltered.remove(-1)?.invoke(list)
+ log(ERROR, "BacklogManager", "storeMessages(${list.size})")
+ backlogStorage.storeMessages(session, list)
}
fun removeBuffer(buffer: BufferId) {
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/Session.kt b/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
index 98f9f522d..def9966bf 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
@@ -63,7 +63,7 @@ class Session(
override val error = _error.toFlowable(BackpressureStrategy.BUFFER)
override val aliasManager = AliasManager(this)
- override val backlogManager = BacklogManager(this, notificationManager, backlogStorage)
+ override val backlogManager = BacklogManager(this, backlogStorage)
override val bufferViewManager = BufferViewManager(this)
override val bufferSyncer = BufferSyncer(this, notificationManager)
override val certManagers = mutableMapOf<IdentityId, CertManager>()
--
GitLab