From 61823bd37026d7a321759dc0255ac904a33966ce Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Thu, 4 Feb 2016 01:04:34 +0100 Subject: [PATCH] Fixed a few tiny bugs --- .../kuschku/libquassel/syncables/types/SyncableObject.java | 3 --- .../libquassel/syncables/types/impl/BacklogManager.java | 7 +++++-- .../libquassel/syncables/types/impl/IrcChannel.java | 2 +- .../kuschku/libquassel/syncables/types/impl/IrcUser.java | 2 +- .../kuschku/libquassel/syncables/types/impl/Network.java | 6 ++++++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java index fe7bb20c2..370a29635 100644 --- a/app/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java +++ b/app/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java @@ -24,7 +24,6 @@ package de.kuschku.libquassel.syncables.types; import android.support.annotation.CallSuper; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.Log; import java.util.ArrayList; import java.util.Arrays; @@ -116,8 +115,6 @@ public abstract class SyncableObject<T extends SyncableObject<T>> extends Observ this.objectName = objectName; this.client = client; this.initialized = true; - - Log.d("libquassel", "init: " + objectName); } public void _update() { 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 81f24b201..973653047 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 @@ -77,22 +77,25 @@ public class BacklogManager extends ABacklogManager<BacklogManager> { } } + // FIXME: Implement @Nullable @Override public BacklogFilter filter(int id) { return null; } + // FIXME: Implement @Nullable @Override public ObservableComparableSortedList<Message> unfiltered(int id) { - return null; + return new ObservableComparableSortedList<>(Message.class); } + // FIXME: Implement @Nullable @Override public ObservableComparableSortedList<Message> filtered(int id) { - return null; + return new ObservableComparableSortedList<>(Message.class); } @Override diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/IrcChannel.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/IrcChannel.java index 1a9fc0372..4e371f952 100644 --- a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/IrcChannel.java +++ b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/IrcChannel.java @@ -477,7 +477,7 @@ public class IrcChannel extends AIrcChannel<IrcChannel> { public void init(@NonNull String objectName, @NonNull BusProvider provider, @NonNull QClient client) { super.init(objectName, provider, client); - String[] split = objectName.split("/"); + String[] split = objectName.split("/", 2); assertEquals(split.length, 2); init(client.networkManager().network(Integer.parseInt(split[0]))); } diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/IrcUser.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/IrcUser.java index 0118e0598..2c00aa28c 100644 --- a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/IrcUser.java +++ b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/IrcUser.java @@ -445,7 +445,7 @@ public class IrcUser extends AIrcUser<IrcUser> { @Override public void init(@NonNull String objectName, @NonNull BusProvider provider, @NonNull QClient client) { super.init(objectName, provider, client); - String[] split = objectName.split("/"); + String[] split = objectName.split("/", 2); assertEquals(split.length, 2); init(client.networkManager().network(Integer.parseInt(split[0]))); } diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/Network.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/Network.java index eb8ac90fd..8f4102367 100644 --- a/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/Network.java +++ b/app/src/main/java/de/kuschku/libquassel/syncables/types/impl/Network.java @@ -755,6 +755,12 @@ public class Network extends ANetwork<Network> implements Observer { super.init(objectName, provider, client); networkInfo._setNetworkId(Integer.parseInt(objectName)); client.networkManager().createNetwork(this); + for (QIrcChannel name : ircChannels()) { + client.requestInitObject("IrcChannel", networkId() + "/" + name.name()); + } + for (QIrcUser name : ircUsers()) { + client.requestInitObject("IrcUser", networkId() + "/" + name.nick()); + } } @Override -- GitLab