Improve client modeing

[~andy/spades] / src / org / pileus / spades / Task.java

diff --git a/src/org/pileus/spades/Task.java b/src/org/pileus/spades/Task.java
index a606d90c1add51b75f019bd77ae988a27dcc1bf3..ac1a243bf3073fd2988f949ce2a703195dcbd798 100644 (file)
--- a/src/org/pileus/spades/Task.java
+++ b/src/org/pileus/spades/Task.java
@@ -149,7 +149,7 @@ public class Task extends Service implements Runnable
                }
 
                // Wait for login
-               while (!this.client.ready) {
+               while (this.client.state == Client.State.SETUP) {
                        Message msg = this.client.recv();
                        if (msg == null)
                                break;
@@ -157,7 +157,7 @@ public class Task extends Service implements Runnable
                }
 
                // Notify connection status
-               if (this.client.ready) {
+               if (this.client.state == Client.State.READY) {
                        this.command(CONNECT, null);
                        this.notify("Connected", android.R.drawable.presence_online);
                } else {
@@ -166,7 +166,7 @@ public class Task extends Service implements Runnable
                }
 
                // Process messages
-               while (this.client.ready) {
+               while (this.client.state == Client.State.READY) {
                        Message msg = this.client.recv();
                        if (msg == null)
                                break;