From 1c8b1ee9c2a2e1b9f93b6b31008aa9972b6a58b9 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 3 Feb 2016 23:22:11 +0100
Subject: [PATCH] Cleaned up debug statements, fixed a bug where the wrong
function was matched in IrcUser
---
app/src/main/java/de/kuschku/libquassel/CoreConnection.java | 2 --
app/src/main/java/de/kuschku/libquassel/client/QClient.java | 2 ++
.../de/kuschku/libquassel/syncables/types/impl/IrcUser.java | 5 -----
.../libquassel/syncables/types/interfaces/QIrcUser.java | 3 +--
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/de/kuschku/libquassel/CoreConnection.java b/app/src/main/java/de/kuschku/libquassel/CoreConnection.java
index 5e15f69e5..8d1967cfe 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 32949f18e..ddf73d341 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 56aa5bf46..8766ad21d 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 5a77aa682..05d0f780c 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);
}
--
GitLab