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

Fixed a few tiny bugs

parent c670500a
Branches
Tags
No related merge requests found
......@@ -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() {
......
......@@ -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
......
......@@ -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])));
}
......
......@@ -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])));
}
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment