From 48842fa524877b544e4d9a2ffe29253abbbf5662 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 4 Feb 2016 19:03:59 +0100
Subject: [PATCH] Fixed a bug in the message formatter

---
 .../main/java/de/kuschku/libquassel/client/Client.java    | 1 +
 .../libquassel/syncables/types/impl/BacklogManager.java   | 8 --------
 app/src/main/java/de/kuschku/util/ui/MessageUtil.java     | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/de/kuschku/libquassel/client/Client.java b/app/src/main/java/de/kuschku/libquassel/client/Client.java
index c089bab10..0684d5df6 100644
--- a/app/src/main/java/de/kuschku/libquassel/client/Client.java
+++ b/app/src/main/java/de/kuschku/libquassel/client/Client.java
@@ -103,6 +103,7 @@ public class Client extends AClient {
         this.backlogManager = new BacklogManager(this, backlogStorage);
         this.backlogManager.init("", provider, this);
         this.notificationManager = new NotificationManager(this);
+        this.initialized = true;
     }
 
     public QBufferViewManager bufferViewManager() {
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/BacklogManager.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/BacklogManager.java
index 1d0bb6287..1ba7b821a 100644
--- a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/BacklogManager.java
+++ b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/BacklogManager.java
@@ -23,7 +23,6 @@ package de.kuschku.libquassel.syncables.types.impl;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.util.Log;
 
 import java.util.HashSet;
 import java.util.List;
@@ -53,7 +52,6 @@ public class BacklogManager extends ABacklogManager<BacklogManager> {
 
     @Override
     public void requestMoreBacklog(int bufferId, int amount) {
-        Log.d("libquassel", "request more backlog for id " + bufferId + ": " + amount);
         Message last;
         if (storage.getUnfiltered(bufferId).isEmpty() || null == (last = storage.getUnfiltered(bufferId).last()))
             requestBacklogInitial(bufferId, amount);
@@ -64,14 +62,12 @@ public class BacklogManager extends ABacklogManager<BacklogManager> {
 
     @Override
     public void requestBacklogInitial(int id, int amount) {
-        Log.d("libquassel", "request initial backlog for id " + id + ": " + amount);
         requestBacklog(id, -1, -1, amount, 0);
     }
 
     @Override
     public void _requestBacklog(int id, int first, int last, int limit, int additional) {
         // Do nothing, we are on the client
-        Log.d("libquassel", "request backlog for id " + id);
     }
 
     @Override
@@ -81,14 +77,11 @@ public class BacklogManager extends ABacklogManager<BacklogManager> {
         storage.insertMessages(id, messages.toArray(new Message[messages.size()]));
         client.initBacklog(id);
         provider.sendEvent(new BacklogReceivedEvent(id));
-
-        Log.d("libquassel", "received backlog for id " + id);
     }
 
     @Override
     public void _requestBacklogAll(int first, int last, int limit, int additional) {
         // Do nothing, we are on the client
-        Log.d("libquassel", "request backlog for all");
     }
 
     @Override
@@ -102,7 +95,6 @@ public class BacklogManager extends ABacklogManager<BacklogManager> {
         }
         for (int id : buffers) {
             provider.sendEvent(new BacklogReceivedEvent(id));
-            Log.d("libquassel", "received backlog for id " + id);
         }
     }
 
diff --git a/app/src/main/java/de/kuschku/util/ui/MessageUtil.java b/app/src/main/java/de/kuschku/util/ui/MessageUtil.java
index afc7785d7..856ecac77 100644
--- a/app/src/main/java/de/kuschku/util/ui/MessageUtil.java
+++ b/app/src/main/java/de/kuschku/util/ui/MessageUtil.java
@@ -157,7 +157,7 @@ public class MessageUtil {
                             Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
                 }
                 if (bg != -1 && themeUtil.res.mircColors[fg] != COLOR_TRANSPARENT) {
-                    newString.setSpan(new BackgroundColorSpan(themeUtil.res.mircColors[fg]), start, end,
+                    newString.setSpan(new BackgroundColorSpan(themeUtil.res.mircColors[bg]), start, end,
                             Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
                 }
             }
-- 
GitLab