Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
QuasselDroid-ng
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
QuasselDroid-ng
Compare revisions
v1.2.6 to v1.2.7
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
justJanne/QuasselDroid-ng
Select target project
No results found
v1.2.7
Select Git revision
Swap
Target
justJanne/QuasselDroid-ng
Select target project
justJanne/QuasselDroid-ng
1 result
v1.2.6
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (1)
Fixes an issue where channel notices were also redirected
· 8b16e1c8
Janne Mareike Koschinski
authored
6 years ago
8b16e1c8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
persistence/src/main/java/de/kuschku/quasseldroid/persistence/util/QuasselBacklogStorage.kt
+6
-1
6 additions, 1 deletion
...ku/quasseldroid/persistence/util/QuasselBacklogStorage.kt
with
6 additions
and
1 deletion
persistence/src/main/java/de/kuschku/quasseldroid/persistence/util/QuasselBacklogStorage.kt
View file @
8b16e1c8
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.