Move toasts to Main

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

diff --git a/src/org/pileus/spades/Main.java b/src/org/pileus/spades/Main.java
index cf0baed4caa470a64dfc3be81ad851bc2ee26d6b..ebca43920a6ef56b5073d59a8e7e6804c424c1d1 100644 (file)
--- a/src/org/pileus/spades/Main.java
+++ b/src/org/pileus/spades/Main.java
@@ -17,6 +17,7 @@ import android.widget.TextView;
 import android.widget.ScrollView;
 import android.widget.TabHost;
 import android.widget.TabWidget;
+import android.widget.Toast;
 
 public class Main extends Activity
 {
@@ -26,6 +27,7 @@ public class Main extends Activity
 
        /* Private data */
        private Task         task;
+       private Toast        toast;
        private boolean      ready;
 
        /* Widgets */
@@ -41,14 +43,14 @@ public class Main extends Activity
        private ScrollView   lscroll;
        private ScrollView   dscroll;
 
-       /* Private methods */
-       public void onRegister(Object obj)
+       /* Private handler methods */
+       private void onRegister(Object obj)
        {
                Os.debug("Main: onRegister");
                this.task = (Task)obj;
        }
 
-       public void onMessage(Object obj)
+       private void onMessage(Object obj)
        {
                Message msg = (Message)obj;
 
@@ -61,6 +63,14 @@ public class Main extends Activity
                }
        }
 
+       private void onNotify(String text)
+       {
+               Os.debug("Main: onNotify - " + text);
+               this.toast.setText(text);
+               this.toast.show();
+       }
+
+       /* Private service methods */
        private void startService()
        {
                Os.debug("Main: startService");
@@ -97,6 +107,9 @@ public class Main extends Activity
                        // Setup main layout
                        this.setContentView(R.layout.main);
 
+                       // Setup toast
+                       this.toast     = Toast.makeText(this, "", Toast.LENGTH_SHORT);
+
                        // Setup communication
                        this.handler   = new MainHandler();
                        this.messenger = new Messenger(this.handler);
@@ -230,6 +243,9 @@ public class Main extends Activity
                                case Task.DISCONNECT:
                                        Main.this.ready = false;
                                        break;
+                               case Task.NOTIFY:
+                                       Main.this.onNotify((String)msg.obj);
+                                       break;
                                default:
                                        Os.debug("Main: unknown message - " + msg.what);
                                        break;