From 11f8b6cf099f8cf6531d02d54a5342045f1a35cc Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 5 May 2018 23:56:44 +0200
Subject: [PATCH] Additional debugging info added
Signed-off-by: Janne Koschinski <janne@kuschku.de>
---
.../persistence/QuasselBacklogStorage.kt | 41 ++++++++++---------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt
index 161937d71..b79e27b9c 100644
--- a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt
+++ b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt
@@ -23,6 +23,7 @@ import de.kuschku.libquassel.protocol.BufferId
import de.kuschku.libquassel.protocol.Message
import de.kuschku.libquassel.quassel.syncables.IgnoreListManager
import de.kuschku.libquassel.session.BacklogStorage
+import de.kuschku.libquassel.session.ISession
import de.kuschku.libquassel.session.Session
class QuasselBacklogStorage(private val db: QuasselDatabase) : BacklogStorage {
@@ -34,10 +35,10 @@ class QuasselBacklogStorage(private val db: QuasselDatabase) : BacklogStorage {
)
}
- override fun storeMessages(session: Session, vararg messages: Message, initialLoad: Boolean) =
- storeMessages(session, messages.asIterable(), initialLoad)
+ override fun storeMessages(session: Session, vararg messages: Message) =
+ storeMessages(session, messages.asIterable())
- override fun storeMessages(session: Session, messages: Iterable<Message>, initialLoad: Boolean) {
+ override fun storeMessages(session: Session, messages: Iterable<Message>) {
db.message().save(*messages.map {
QuasselDatabase.MessageData(
messageId = it.messageId,
@@ -67,24 +68,26 @@ class QuasselBacklogStorage(private val db: QuasselDatabase) : BacklogStorage {
db.message().clearMessages()
}
- private fun isIgnored(session: Session, message: Message): Boolean {
- val bufferName = message.bufferInfo.bufferName ?: ""
- val networkId = message.bufferInfo.networkId
- val networkName = session.network(networkId)?.networkName() ?: ""
+ companion object {
+ fun isIgnored(session: ISession, message: Message): Boolean {
+ val bufferName = message.bufferInfo.bufferName ?: ""
+ val networkId = message.bufferInfo.networkId
+ val networkName = session.network(networkId)?.networkName() ?: ""
- return session.ignoreListManager.match(
- message.content, message.sender, message.type, networkName, bufferName
- ) != IgnoreListManager.StrictnessType.UnmatchedStrictness
- }
+ return session.ignoreListManager?.match(
+ message.content, message.sender, message.type, networkName, bufferName
+ ) != IgnoreListManager.StrictnessType.UnmatchedStrictness
+ }
- private fun isIgnored(session: Session, message: QuasselDatabase.MessageData): Boolean {
- val bufferInfo = session.bufferSyncer.bufferInfo(message.bufferId)
- val bufferName = bufferInfo?.bufferName ?: ""
- val networkId = bufferInfo?.networkId ?: -1
- val networkName = session.network(networkId)?.networkName() ?: ""
+ fun isIgnored(session: ISession, message: QuasselDatabase.MessageData): Boolean {
+ val bufferInfo = session.bufferSyncer?.bufferInfo(message.bufferId)
+ val bufferName = bufferInfo?.bufferName ?: ""
+ val networkId = bufferInfo?.networkId ?: -1
+ val networkName = session.network(networkId)?.networkName() ?: ""
- return session.ignoreListManager.match(
- message.content, message.sender, message.type, networkName, bufferName
- ) != IgnoreListManager.StrictnessType.UnmatchedStrictness
+ return session.ignoreListManager?.match(
+ message.content, message.sender, message.type, networkName, bufferName
+ ) != IgnoreListManager.StrictnessType.UnmatchedStrictness
+ }
}
}
--
GitLab