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

Remove debug code for #64

parent ffa73a2d
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -52,17 +52,11 @@ class BacklogRequester( ...@@ -52,17 +52,11 @@ class BacklogRequester(
)?.messageId ?: -1, )?.messageId ?: -1,
limit = amount limit = amount
) { ) {
log(ERROR,
"BacklogRequester",
"received(buffer: $buffer, amount: $amount, pageSize: $pageSize, lastMessageId: $lastMessageId, untilAllVisible: $untilAllVisible)")
log(ERROR, "BacklogRequester", "message count: ${it.size}")
if (it.isNotEmpty()) { if (it.isNotEmpty()) {
val visibleMessages = it.count { missing -= it.count {
(it.type.value and filtered.inv()) != 0 && (it.type.value and filtered.inv()) != 0 &&
!QuasselBacklogStorage.isIgnored(session, it) !QuasselBacklogStorage.isIgnored(session, it)
} }
log(ERROR, "BacklogRequester", "visibleMessages: $visibleMessages")
missing -= visibleMessages
val hasLoadedAll = missing == 0 val hasLoadedAll = missing == 0
val hasLoadedAny = missing < amount val hasLoadedAny = missing < amount
if (untilAllVisible && !hasLoadedAll || !untilAllVisible && !hasLoadedAny) { if (untilAllVisible && !hasLoadedAll || !untilAllVisible && !hasLoadedAny) {
...@@ -76,12 +70,10 @@ class BacklogRequester( ...@@ -76,12 +70,10 @@ class BacklogRequester(
finishCallback) finishCallback)
true true
} else { } else {
log(ERROR, "BacklogRequester", "finished")
finishCallback() finishCallback()
true true
} }
} else { } else {
log(ERROR, "BacklogRequester", "finished")
finishCallback() finishCallback()
true true
} }
......
...@@ -45,8 +45,6 @@ import de.kuschku.libquassel.protocol.BufferId ...@@ -45,8 +45,6 @@ import de.kuschku.libquassel.protocol.BufferId
import de.kuschku.libquassel.protocol.MsgId import de.kuschku.libquassel.protocol.MsgId
import de.kuschku.libquassel.quassel.syncables.BufferSyncer import de.kuschku.libquassel.quassel.syncables.BufferSyncer
import de.kuschku.libquassel.session.SessionManager import de.kuschku.libquassel.session.SessionManager
import de.kuschku.libquassel.util.compatibility.LoggingHandler.Companion.log
import de.kuschku.libquassel.util.compatibility.LoggingHandler.LogLevel.ERROR
import de.kuschku.libquassel.util.helpers.mapSwitchMap import de.kuschku.libquassel.util.helpers.mapSwitchMap
import de.kuschku.libquassel.util.helpers.value import de.kuschku.libquassel.util.helpers.value
import de.kuschku.libquassel.util.irc.HostmaskHelper import de.kuschku.libquassel.util.irc.HostmaskHelper
...@@ -198,7 +196,6 @@ class MessageListFragment : ServiceBoundFragment() { ...@@ -198,7 +196,6 @@ class MessageListFragment : ServiceBoundFragment() {
PagedList.BoundaryCallback<DisplayMessage>() { PagedList.BoundaryCallback<DisplayMessage>() {
override fun onItemAtFrontLoaded(itemAtFront: DisplayMessage) = Unit override fun onItemAtFrontLoaded(itemAtFront: DisplayMessage) = Unit
override fun onItemAtEndLoaded(itemAtEnd: DisplayMessage) { override fun onItemAtEndLoaded(itemAtEnd: DisplayMessage) {
log(ERROR, "MessageListFragment", "onItemAtEndLoaded")
loadMore() loadMore()
} }
} }
...@@ -257,7 +254,6 @@ class MessageListFragment : ServiceBoundFragment() { ...@@ -257,7 +254,6 @@ class MessageListFragment : ServiceBoundFragment() {
swipeRefreshLayout.setColorSchemeColors(*senderColors) swipeRefreshLayout.setColorSchemeColors(*senderColors)
swipeRefreshLayout.setOnRefreshListener { swipeRefreshLayout.setOnRefreshListener {
log(ERROR, "MessageListFragment", "swipeRefreshed")
loadMore() loadMore()
} }
...@@ -337,7 +333,6 @@ class MessageListFragment : ServiceBoundFragment() { ...@@ -337,7 +333,6 @@ class MessageListFragment : ServiceBoundFragment() {
val filtered = database.filtered().get(accountId, bufferId) val filtered = database.filtered().get(accountId, bufferId)
// Try loading messages when switching to isEmpty buffer // Try loading messages when switching to isEmpty buffer
val hasVisibleMessages = database.message().hasVisibleMessages(bufferId, filtered ?: 0) val hasVisibleMessages = database.message().hasVisibleMessages(bufferId, filtered ?: 0)
log(ERROR, "MessageListFragment", "connected(hasVisibleMessages: $hasVisibleMessages)")
if (!hasVisibleMessages) { if (!hasVisibleMessages) {
if (bufferId > 0 && bufferId != Int.MAX_VALUE) { if (bufferId > 0 && bufferId != Int.MAX_VALUE) {
loadMore(initial = true) loadMore(initial = true)
...@@ -374,8 +369,6 @@ class MessageListFragment : ServiceBoundFragment() { ...@@ -374,8 +369,6 @@ class MessageListFragment : ServiceBoundFragment() {
var lastBuffer = -1 var lastBuffer = -1
data.observe(this, Observer { list -> data.observe(this, Observer { list ->
log(ERROR, "MessageListFragment", "Messages Changed ${list?.size}")
val firstVisibleItemPosition = linearLayoutManager.findFirstVisibleItemPosition() val firstVisibleItemPosition = linearLayoutManager.findFirstVisibleItemPosition()
val firstVisibleMessageId = adapter[firstVisibleItemPosition]?.content?.messageId val firstVisibleMessageId = adapter[firstVisibleItemPosition]?.content?.messageId
runInBackground { runInBackground {
...@@ -454,7 +447,6 @@ class MessageListFragment : ServiceBoundFragment() { ...@@ -454,7 +447,6 @@ class MessageListFragment : ServiceBoundFragment() {
// Try loading messages when switching to isEmpty buffer // Try loading messages when switching to isEmpty buffer
val filtered = database.filtered().get(accountId, current) val filtered = database.filtered().get(accountId, current)
val hasVisibleMessages = database.message().hasVisibleMessages(current, filtered ?: 0) val hasVisibleMessages = database.message().hasVisibleMessages(current, filtered ?: 0)
log(ERROR, "MessageListFragment", "bufferChange(hasVisibleMessages: $hasVisibleMessages)")
if (!hasVisibleMessages) { if (!hasVisibleMessages) {
if (current > 0 && current != Int.MAX_VALUE) { if (current > 0 && current != Int.MAX_VALUE) {
loadMore(initial = true) loadMore(initial = true)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment