massive robustness overhaul

[org.ibex.mail.git] / src / org / ibex / mail / protocol / GMail.java

diff --git a/src/org/ibex/mail/protocol/GMail.java b/src/org/ibex/mail/protocol/GMail.java
index f9b2dcc..02b85e4 100644 (file)
--- a/src/org/ibex/mail/protocol/GMail.java
+++ b/src/org/ibex/mail/protocol/GMail.java
@@ -3,7 +3,6 @@
 // You may not use this file except in compliance with the License.
 
 package org.ibex.mail.protocol;
-import org.ibex.io.*;
 import org.ibex.crypto.*;
 import org.ibex.mail.protocol.*;
 import org.ibex.jinetd.Listener;
@@ -17,6 +16,8 @@ import java.util.*;
 import java.net.*;
 import java.text.*;
 import java.io.*;
+import org.ibex.io.*;
+import org.ibex.io.Fountain;
 
 public class GMail extends Account {
 
@@ -129,7 +130,7 @@ public class GMail extends Account {
                 final int num = i;
                 if (q.match(new Mailbox.Iterator() {
                         public Message cur() { return m; }
-                        public MIME.Headers head() { return m.headers; }
+                        public Headers head() { return m.headers; }
                         public boolean next() { return false; }
                         public int     uid() { return num; }
                         public int     num() { return num; }
@@ -154,7 +155,8 @@ public class GMail extends Account {
                         public void    setFlags(int flags) { }
                     })) {
                     Log.info(GMail.class, "fetch " + summaries[i].subject);
-                    client.fetch(i+1, 0, m.size(), m,/* summaries[i].getIntId()*/ i);
+                    throw new Error("broken");
+                    //client.fetch(i+1, 0, m.size(), m,/* summaries[i].getIntId()*/ i);
                 }
             } catch (Exception e) { Log.warn(this, e); }
         }
@@ -227,7 +229,7 @@ public class GMail extends Account {
             "</form>\r\n"+
             "</body></html>\r\n";
         try {
-            captchaMessage = Message.newMessage(new Stream(str));
+            captchaMessage = Message.newMessage(new Fountain.StringFountain(str));
         } catch (Message.Malformed e) {
             Log.warn(this, e);
             throw new IOException(e.toString());
@@ -287,11 +289,14 @@ public class GMail extends Account {
         public int getIntId() { return Math.abs(Integer.parseInt(id.toLowerCase().substring(id.length()-7), 16)); }
 
         public Message getMessage() throws Message.Malformed, IOException {
+            throw new Error("broken right now");
+            /*
             if (message != null) return message;
             Stream thestream =
                 new Stream(new HTTP(gmail+"?search=query&start=0&view=om&th=" + URLEncoder.encode(id)).GET(null, jar));
             thestream.readln();
-            return message = Message.newMessage(thestream);
+            return message = Message.newMessage(new Fountain.StringFountainthestream);
+            */
         }
         
         public Summary(JSArray m) {