Add support for SASL PLAIN authentication

[~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 10f44e50282891a0e639afda3f92199fc726dc51..f5118c13f1793f860428616dec2d59cc49390f14 100644 (file)
--- a/src/org/pileus/spades/Main.java
+++ b/src/org/pileus/spades/Main.java
@@ -6,23 +6,33 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Messenger;
 import android.text.method.ScrollingMovementMethod;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.ScrollView;
 import android.widget.TabHost;
 import android.widget.TabWidget;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import android.preference.PreferenceActivity;
 
 public class Main extends Activity
 {
        /* Static data */
-       private Handler      handler; 
-       private Messenger    messenger; 
+       private Handler      handler;
+       private Messenger    messenger;
 
        /* Private data */
        private Task         task;
+       private Toast        toast;
+       private boolean      ready;
+       private String       topic;
+       private String       names;
 
        /* Widgets */
        private TabHost      window;
@@ -37,26 +47,64 @@ public class Main extends Activity
        private ScrollView   lscroll;
        private ScrollView   dscroll;
 
-       /* Private methods */
-       public void onRegister(Object obj)
+       /* Private helper methods */
+       private void notice(String text)
+       {
+               this.log.append("*** " + text + "\n");
+       }
+
+       /* 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;
 
+               // Debug
                this.debug.append("> " + msg.line + "\n");
                this.dscroll.smoothScrollTo(0, this.debug.getBottom());
 
-               if (msg.cmd.equals("PRIVMSG")) {
-                       this.log.append(msg.from + ": " + msg.msg + "\n");
-                       this.lscroll.smoothScrollTo(0, this.log.getBottom());
+               // Chat
+               switch (msg.type) {
+                       case PRIVMSG:
+                               this.log.append(msg.from + ": " + msg.msg + "\n");
+                               break;
+                       case TOPIC:
+                               if (!msg.txt.equals(this.topic))
+                                       this.notice("Topic for " + msg.arg + ": " + msg.txt);
+                               this.topic = msg.txt;
+                               break;
+                       case NAMES:
+                               if (!msg.txt.equals(this.names))
+                                       this.notice("Users in " + msg.arg + ": " + msg.txt);
+                               this.names = msg.txt;
+                               break;
+                       case ERROR:
+                               this.notice("Error: " + msg.txt);
+                               break;
+                       case AUTHOK:
+                               this.notice("Authentication succeeded: " + msg.txt);
+                               break;
+                       case AUTHFAIL:
+                               this.notice("Authentication failed: " + msg.txt);
+                               break;
                }
+               this.lscroll.smoothScrollTo(0, this.log.getBottom());
        }
 
+       private void onNotify(String text)
+       {
+               Os.debug("Main: onNotify - " + text);
+               this.notice(text);
+               this.toast.setText(text);
+               this.toast.show();
+       }
+
+       /* Private service methods */
        private void startService()
        {
                Os.debug("Main: startService");
@@ -80,7 +128,6 @@ public class Main extends Activity
                if (msg == null)
                        return;
                this.input.setText("");
-               this.log.append(msg.from + ": " + msg.msg + "\n");
        }
 
        /* Activity Methods */
@@ -94,6 +141,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);
@@ -126,10 +176,6 @@ public class Main extends Activity
                                        .newTabSpec("debug")
                                        .setIndicator("Debug")
                                        .setContent(R.id.debug));
-
-                       // Start IRC service
-                       this.startService();
-
                } catch (Exception e) {
                        Os.debug("Error setting content view", e);
                        return;
@@ -178,6 +224,44 @@ public class Main extends Activity
                Os.debug("Main: onDestroy");
        }
 
+       @Override
+       public boolean onCreateOptionsMenu(Menu menu)
+       {
+               MenuInflater inflater = getMenuInflater();
+               inflater.inflate(R.menu.main, menu);
+               return true;
+       }
+
+       @Override
+       public boolean onPrepareOptionsMenu(Menu menu)
+       {
+               menu.findItem(R.id.connect).setVisible(!this.ready);
+               menu.findItem(R.id.disconnect).setVisible(this.ready);
+               return true;
+       }
+
+       @Override
+       public boolean onOptionsItemSelected(MenuItem item)
+       {
+               switch (item.getItemId()) {
+                       case R.id.connect:
+                               this.startService();
+                               return true;
+                       case R.id.disconnect:
+                               this.stopService();
+                               return true;
+                       case R.id.settings:
+                               this.startActivity(new Intent(this, Prefs.class));
+                               return true;
+                       case R.id.exit:
+                               this.stopService();
+                               this.finish();
+                               return true;
+                       default:
+                               return false;
+               }
+       }
+
        /* Handler class */
        class MainHandler extends Handler
        {
@@ -190,6 +274,15 @@ public class Main extends Activity
                                case Task.MESSAGE:
                                        Main.this.onMessage(msg.obj);
                                        break;
+                               case Task.CONNECT:
+                                       Main.this.ready = true;
+                                       break;
+                               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;
@@ -197,4 +290,3 @@ public class Main extends Activity
                }
        }
 }
-