Changeset 266 for trunk/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java

Timestamp:

08/04/08 09:17:20 PM (4 months ago)

Author:

octorian

Message:

Initial IMAP IDLE implementation

Files:

• trunk/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java (modified) (10 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java

@@ -103 +103 @@
     protected OutputStream output;
     private boolean useWiFi;
+    private int fakeAvailable = -1;
     
     /**
@@ -114 +115 @@
     private byte[] buffer = new byte[128];
     
-    /**
-     * Holds the actual number of bytes in the buffer.
-     */
-    private int count;
-
     /**
      * Holds a list of open connections
@@ -150 +146 @@
         
         String protocolStr = (useSSL ? "ssl" : "socket");
-        // This param, which allows bypassing the MDS proxy, should probably
+        // This parameter, which allows bypassing the MDS proxy, should probably
         // be a global user configurable option
         String paramStr = (deviceSide ? ";deviceside=true" : "");
@@ -287 +283 @@
      * Sends a string to the server. This method is used internally for
      * all outgoing communication to the server. The main thing it does
-     * it terminate the line with a CR/LF. If there are occurences of CR or
+     * it terminate the line with a CR/LF. If there are occurrences of CR or
      * LF inside the string, the method ensures that proper CR/LF sequences
-     * are sent for them, since this is what most internet protocols expect.
+     * are sent for them, since this is what most Internet protocols expect.
      *
      * @see #receive
@@ -316 +312 @@
                 
                 /**
-                 * Find next occurence of a line separator or the end of the
+                 * Find next occurrence of a line separator or the end of the
                  * string.
                  */
@@ -384 +380 @@
     }
 
+    /**
+     * Returns the number of bytes available for reading.
+     * Used to poll the connection without blocking.
+     * 
+     * @see InputStream#available()
+     */
+    public int available() throws IOException {
+        if(fakeAvailable == -1) {
+                return input.available();
+        }
+        else {
+                return fakeAvailable;
+        }
+    }
+    
     /**
      * Receives a string from the server. This method is used internally for
@@ -403 +414 @@
          * characters belonging to a line were read. The result was
          * a high level of heap fragmentation, which made applications
-         * instable on MIDP devices (that don't provide compacting GC,
+         * unstable on MIDP devices (that don't provide compacting GC,
          * that is).
          *
@@ -423 +434 @@
         StringBuffer resultBuffer = new StringBuffer();
         boolean stop = false;
+        int actualAvailable = input.available();
+        int readBytes = 0;
+        int count;
         
         /**
@@ -470 +484 @@
                  */
                 // Note: We really should look for CRLF, and not use this
-                // half-assed approach which screws up on mid-lime LFs. (DK)
+                // approach which screws up on mid-line LFs. (DK)
                 else {
                     byte b = buffer[count];
+                    readBytes++;
                     
                     /**
@@ -504 +519 @@
             EventLogger.logEvent(AppInfo.GUID, ("[RECV] " + resultBuffer.toString()).getBytes(), EventLogger.DEBUG_INFO);
         }
+        if(actualAvailable > readBytes) {
+                fakeAvailable = actualAvailable - readBytes;
+        }
+        else {
+                fakeAvailable = -1;
+        }
         
         return resultBuffer.toString();