From 8b16e1c8956a1d3cdcd0afb2e6d88b444d6bb3b4 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Mon, 17 Jun 2019 20:02:55 +0200
Subject: [PATCH] Fixes an issue where channel notices were also redirected
---
.../quasseldroid/persistence/util/QuasselBacklogStorage.kt | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/util/QuasselBacklogStorage.kt b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/util/QuasselBacklogStorage.kt
index ad9d46860..63c22a899 100644
--- a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/util/QuasselBacklogStorage.kt
+++ b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/util/QuasselBacklogStorage.kt
@@ -20,11 +20,13 @@
package de.kuschku.quasseldroid.persistence.util
import de.kuschku.libquassel.protocol.BufferId
+import de.kuschku.libquassel.protocol.Buffer_Type
import de.kuschku.libquassel.protocol.Message
import de.kuschku.libquassel.protocol.NetworkId
import de.kuschku.libquassel.quassel.syncables.IgnoreListManager
import de.kuschku.libquassel.session.BacklogStorage
import de.kuschku.libquassel.session.ISession
+import de.kuschku.libquassel.util.flag.hasFlag
import de.kuschku.quasseldroid.persistence.db.QuasselDatabase
import de.kuschku.quasseldroid.persistence.models.MessageData
import io.reactivex.subjects.BehaviorSubject
@@ -53,7 +55,10 @@ class QuasselBacklogStorage(private val db: QuasselDatabase) : BacklogStorage {
type = it.type,
flag = it.flag,
bufferId = it.bufferInfo.bufferId,
- currentBufferId = currentBuffer.value,
+ currentBufferId =
+ if (it.bufferInfo.type.hasFlag(Buffer_Type.QueryBuffer) ||
+ it.bufferInfo.type.hasFlag(Buffer_Type.StatusBuffer)) currentBuffer.value
+ else BufferId(0),
networkId = it.bufferInfo.networkId,
sender = it.sender,
senderPrefixes = it.senderPrefixes,
--
GitLab