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 fe7bb20c29b0a5cff05b66f96edb6b8cfe29d830..370a29635e23c7206f4dc4d6d44119267f503676 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 81f24b20163a736871fb7b3c548233643dfce7bf..97365304789c270684d33541eb005aee0284bf12 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 1a9fc0372ec4a1abb5f422dd1e6f09eb566bb664..4e371f952db903e8df20c54e3850da2f0727093e 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 0118e0598fd5fb05c9c1b4c122b87519800b2921..2c00aa28cc533b343d7db56cb41a8bb4902e306f 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 eb8ac90fd02a33df92c5dcbae8f7a736ba785983..8f410236732b125a11435c37e1eb1143a96ad32e 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