Skip to content
Snippets Groups Projects
Verified Commit 8b16e1c8 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixes an issue where channel notices were also redirected

parent 60f1776e
Branches master
No related tags found
No related merge requests found
Pipeline #504 passed
...@@ -20,11 +20,13 @@ ...@@ -20,11 +20,13 @@
package de.kuschku.quasseldroid.persistence.util package de.kuschku.quasseldroid.persistence.util
import de.kuschku.libquassel.protocol.BufferId import de.kuschku.libquassel.protocol.BufferId
import de.kuschku.libquassel.protocol.Buffer_Type
import de.kuschku.libquassel.protocol.Message import de.kuschku.libquassel.protocol.Message
import de.kuschku.libquassel.protocol.NetworkId import de.kuschku.libquassel.protocol.NetworkId
import de.kuschku.libquassel.quassel.syncables.IgnoreListManager import de.kuschku.libquassel.quassel.syncables.IgnoreListManager
import de.kuschku.libquassel.session.BacklogStorage import de.kuschku.libquassel.session.BacklogStorage
import de.kuschku.libquassel.session.ISession 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.db.QuasselDatabase
import de.kuschku.quasseldroid.persistence.models.MessageData import de.kuschku.quasseldroid.persistence.models.MessageData
import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.BehaviorSubject
...@@ -53,7 +55,10 @@ class QuasselBacklogStorage(private val db: QuasselDatabase) : BacklogStorage { ...@@ -53,7 +55,10 @@ class QuasselBacklogStorage(private val db: QuasselDatabase) : BacklogStorage {
type = it.type, type = it.type,
flag = it.flag, flag = it.flag,
bufferId = it.bufferInfo.bufferId, 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, networkId = it.bufferInfo.networkId,
sender = it.sender, sender = it.sender,
senderPrefixes = it.senderPrefixes, senderPrefixes = it.senderPrefixes,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment