diff --git a/app/src/main/java/de/kuschku/libquassel/CoreConnection.java b/app/src/main/java/de/kuschku/libquassel/CoreConnection.java index 5e15f69e5eaadfa037b00bb7b2e853bfef1efa35..8d1967cfe0fa68a5c303bd6c4a0b073ff00962b9 100644 --- a/app/src/main/java/de/kuschku/libquassel/CoreConnection.java +++ b/app/src/main/java/de/kuschku/libquassel/CoreConnection.java @@ -332,8 +332,6 @@ public class CoreConnection { Heartbeat heartbeat = new Heartbeat(); busProvider.dispatch(heartbeat); - Log.d("libquassel", "Sending heartbeat"); - Thread.sleep(30 * 1000); } } catch (InterruptedException e) { diff --git a/app/src/main/java/de/kuschku/libquassel/client/QClient.java b/app/src/main/java/de/kuschku/libquassel/client/QClient.java index 32949f18e88a3a239fafe826bc60a7a6fe03c492..ddf73d341fd6b4d8aa718ccd16de6fed533b6ac0 100644 --- a/app/src/main/java/de/kuschku/libquassel/client/QClient.java +++ b/app/src/main/java/de/kuschku/libquassel/client/QClient.java @@ -432,6 +432,8 @@ public class QClient extends AClient { public void bufferSync(@NonNull SyncFunction packedFunc) { String key = hashName(packedFunc.className, packedFunc.objectName); + if (connectionStatus() == ConnectionChangeEvent.Status.CONNECTED) + Log.d("libquassel", "Queueing sync: " + packedFunc); if (!bufferedSyncs.containsKey(key)) bufferedSyncs.put(key, new LinkedList<>()); bufferedSyncs.get(key).add(packedFunc); 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 56aa5bf4695befe3100a187e4d5798b728703fde..8766ad21df0324a5304a89fd2d74fb31359234da 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 @@ -413,11 +413,6 @@ public class IrcUser extends AIrcUser<IrcUser> { } @Override - public void init(Network network) { - this.network = network; - _update(); - } - public void init(QNetwork network) { this.network = network; channels = new HashSet<>(); diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/interfaces/QIrcUser.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/interfaces/QIrcUser.java index 5a77aa6826ffbb63a43205c48f21c0c7c963432c..05d0f780cc3ae7a528452e133739a285c7712b46 100644 --- a/app/src/main/java/de/kuschku/libquassel/syncables/types/interfaces/QIrcUser.java +++ b/app/src/main/java/de/kuschku/libquassel/syncables/types/interfaces/QIrcUser.java @@ -28,7 +28,6 @@ import org.joda.time.DateTime; import java.util.List; import de.kuschku.libquassel.syncables.Synced; -import de.kuschku.libquassel.syncables.types.impl.Network; public interface QIrcUser { String user(); @@ -203,5 +202,5 @@ public interface QIrcUser { void _removeUserModes(final String modes); - void init(Network network); + void init(QNetwork network); }