Changeset 449

Timestamp:

06/03/09 17:40:24 (3 years ago)

Author:

octorian

Message:

 

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail

Files:

• LogicMail.rrc (modified) (3 diffs)
• LogicMail.rrh (modified) (1 diff)
• LogicMail_da.rrc (modified) (5 diffs)
• ui/AcctCfgScreen.java (modified) (2 diffs)
• ui/CompositionScreen.java (modified) (1 diff)
• ui/EmailAddressBookEditField.java (modified) (1 diff)
• ui/IdentityConfigScreen.java (modified) (1 diff)
• ui/MessageScreen.java (modified) (2 diffs)
• util/Connection.java (modified) (27 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/LogicMail.rrc

@@ -47 +47 @@
 CONFIG_IDENTITY_IDENTITY#0="Identity:";
 CONFIG_IDENTITY_REPLYTO_ADDRESS#0="Reply-To address:";
+CONFIG_IDENTITY_SIGNATURE#0="Signature:";
 CONFIG_IDENTITY_TITLE#0="Identity";
 CONFIG_OUTGOING_AUTHENTICATION#0="Authentication:";
@@ -104 +105 @@
 MENUITEM_SEND#0="Send";
 MENUITEM_UNDELETE#0="Undelete";
+MESSAGEPROPERTIES_BCC#0="Bcc:";
 MESSAGEPROPERTIES_CC#0="Cc:";
 MESSAGEPROPERTIES_DATE#0="Date:";
@@ -114 +116 @@
 MESSAGEPROPERTIES_TO#0="To:";
 MESSAGERENDERER_UNSUPPORTED#0="Unsupported type:";
+MESSAGE_ATTACHMENTS#0="Attachments";
 MESSAGE_NOTDISPLAYABLE#0="This message does not contain any sections that could be displayed.";
 MESSAGE_SELECT_FOLDER_COPY_TO#0="Select a folder to copy this message into:";

trunk/LogicMail/src/org/logicprobe/LogicMail/LogicMail.rrh

@@ -147 +147 @@
 CONFIG_GLOBAL_LANGUAGE#0=145;
 CONFIG_GLOBAL_UNICODE_NORMALIZATION#0=146;
+MESSAGEPROPERTIES_BCC#0=147;
+CONFIG_IDENTITY_SIGNATURE#0=148;
+MESSAGE_ATTACHMENTS#0=149;

trunk/LogicMail/src/org/logicprobe/LogicMail/LogicMail_da.rrc

@@ -27 +27 @@
 CONFIG_ACCOUNT_USEMDSPROXY#0="Brug MDS proxy";
 CONFIG_ACCOUNT_USERNAME#0="Brugernavn:";
-CONFIG_GLOBAL_CONNECTION_DEBUGGING#0="Forbindelses fejlsøgning";
+CONFIG_GLOBAL_CONNECTION_DEBUGGING#0="Fejlsøgning af forbindelse";
 CONFIG_GLOBAL_GLOBAL_SETTINGS#0="Globale indstillinger:";
 CONFIG_GLOBAL_HIDE_DELETED_MESSAGES#0="Skjul slettede beskeder";
 CONFIG_GLOBAL_HOSTNAME#0="Hostnavn:";
 CONFIG_GLOBAL_IMAP_SETTINGS#0="IMAP indstillinger:";
-CONFIG_GLOBAL_LOCAL_DATA_LOCATION#0="Local data location:";
-CONFIG_GLOBAL_MESSAGE_COUNT#0="Antal e-mails:";
-CONFIG_GLOBAL_MESSAGE_ORDER#0="Message order:";
+CONFIG_GLOBAL_LANGUAGE#0="Sprog:";
+CONFIG_GLOBAL_LOCAL_DATA_LOCATION#0="Lokal data placering:";
+CONFIG_GLOBAL_MESSAGE_COUNT#0="Antal beskeder:";
+CONFIG_GLOBAL_MESSAGE_ORDER#0="Besked sortering:";
 CONFIG_GLOBAL_OVERRIDE_HOSTNAME#0="Overskriv hostnavn";
 CONFIG_GLOBAL_POP_SETTINGS#0="POP indstillinger:";
 CONFIG_GLOBAL_SETTINGS#0="Globale indstillinger";
 CONFIG_GLOBAL_TITLE#0="Global";
+CONFIG_GLOBAL_UNICODE_NORMALIZATION#0="Unicode normalisering";
 CONFIG_GLOBAL_WIFI_MODE#0="WiFi tilstand:";
 CONFIG_IDENTITIES#0="Identiteter";
-CONFIG_IDENTITY_EMAIL_ADDRESS#0="Email addresse:";
+CONFIG_IDENTITY_EMAIL_ADDRESS#0="E-mail addresse:";
 CONFIG_IDENTITY_FULL_NAME#0="Fulde navn:";
 CONFIG_IDENTITY_IDENTITY#0="Identitet:";
 CONFIG_IDENTITY_REPLYTO_ADDRESS#0="Svar-til adresse:";
 CONFIG_IDENTITY_TITLE#0="Identitet";
-CONFIG_OUTGOING_AUTHENTICATION#0="Godkendelse:"; 
+CONFIG_OUTGOING_AUTHENTICATION#0="Godkendelse:";
 CONFIG_OUTGOING_SERVERS#0="Udgående servere";
 CONFIG_OUTGOING_TITLE#0="Udgående (SMTP)";
@@ -52 +54 @@
 CONFIG_TITLE#0="Konfiguration";
 CONFIG_WHAT_ACCOUNT_TYPE#0="Vælg konto type?";
+EMAILADDRESSBOOKEDIT_ALERT_GROUPS_UNSUPPORTED#0="Distributions grupper er på nuværende tidpunkt understøttet!";
+EMAILADDRESSBOOKEDIT_ALERT_NO_ADDRESS#0="Den valgte kontaktperson har ingen e-mail adresse!";
+EMAILADDRESSBOOKEDIT_NAME#0="Adresse:";
+EMAILADDRESSBOOKEDIT_WHICH_ADDRESS#0="Hvilken adresse?";
 ERROR_UNKNOWN#0="Ukendt fejl";
 LOGIN_TITLE#0="Godkendelse"; 
@@ -59 +65 @@
 MENUITEM_ABOUT#0="Om";
 MENUITEM_ADD_ACCOUNT#0="Ny konto";
-MENUITEM_ADD_BCC#0="Tilføj Bcc:"; 
+MENUITEM_ADD_BCC#0="Tilføj Bcc:";
 MENUITEM_ADD_CC#0="Tilføj Cc:";
 MENUITEM_ADD_IDENTITY#0="Ny identitet";
@@ -67 +73 @@
 MENUITEM_CANCEL#0="Afbryd";
 MENUITEM_CLOSE#0="Luk";
-MENUITEM_COMPOSE_EMAIL#0="Ny email";
+MENUITEM_COMPOSE_EMAIL#0="Ny e-mail";
 MENUITEM_CONFIGURATION#0="Konfiguration";
 MENUITEM_COPY_TO#0="Kopier til...";
@@ -74 +80 @@
 MENUITEM_DELETE_IDENTITY#0="Slet identitet";
 MENUITEM_DELETE_OUTGOING_SERVER#0="Slet udgående server";
-MENUITEM_DISABLED#0="Deaktiveret"; 
+MENUITEM_DISABLED#0="Deaktiveret";
 MENUITEM_DISCARD#0="Kassér";
 MENUITEM_DISCONNECT#0="Afbryd";

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/AcctCfgScreen.java

@@ -103 +103 @@
     private class NullOutgoingConfig extends OutgoingConfig {
         public String toString() {
-            return "None";
+            return resources.getString(LogicMailResource.CONFIG_ACCOUNT_NONE);
         }
         public long getUniqueId() {
@@ -406 +406 @@
         }
         else {
-                buf.append("<NONE>");
+                buf.append('<' + resources.getString(LogicMailResource.CONFIG_ACCOUNT_NONE) + '>');
         }
                 return buf.toString();

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/CompositionScreen.java

@@ -285 +285 @@
                         | Manager.NO_VERTICAL_SCROLL
                         | BorderedFieldManager.BOTTOM_BORDER_LINE);
-        subjectEditField = new AutoTextEditField("Subject: ", "");
+        subjectEditField = new AutoTextEditField(resources.getString(LogicMailResource.MESSAGEPROPERTIES_SUBJECT) + ' ', "");
         subjectFieldManager.add(subjectEditField);
         

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/EmailAddressBookEditField.java

@@ -108 +108 @@
         switch(addressType) {
         case ADDRESS_TO:
-                this.setLabel("To: ");
+                this.setLabel(resources.getString(LogicMailResource.MESSAGEPROPERTIES_TO) + ' ');
                 break;
         case ADDRESS_CC:
-                this.setLabel("Cc: ");
+                this.setLabel(resources.getString(LogicMailResource.MESSAGEPROPERTIES_CC) + ' ');
                 break;
         case ADDRESS_BCC:
-                this.setLabel("Bcc: ");
+                this.setLabel(resources.getString(LogicMailResource.MESSAGEPROPERTIES_BCC) + ' ');
                 break;
         default:
-                this.setLabel("To: ");
+                this.setLabel(resources.getString(LogicMailResource.MESSAGEPROPERTIES_TO) + ' ');
                 addressType = ADDRESS_TO;
         }

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/IdentityConfigScreen.java

@@ -89 +89 @@
         add(replyToAddressField);
         add(new SeparatorField());
-        add(new RichTextField("Signature:", Field.NON_FOCUSABLE));
+        add(new RichTextField(resources.getString(LogicMailResource.CONFIG_IDENTITY_SIGNATURE), Field.NON_FOCUSABLE));
         add(msgSignatureField);
         add(new SeparatorField());

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/MessageScreen.java

@@ -186 +186 @@
     private MenuItem propsItem = new MenuItem(resources, LogicMailResource.MENUITEM_PROPERTIES, 100, 10) {
         public void run() {
-                //MessagePropertiesDialog dialog = new MessagePropertiesDialog(messageNode);
-                //dialog.doModal();
                 MessagePropertiesScreen screen = new MessagePropertiesScreen(messageNode);
                 UiApplication.getUiApplication().pushScreen(screen);
@@ -340 +338 @@
                         }}, Field.FOCUSABLE);
                 attachmentsTreeField.setDefaultExpanded(false);
-                int id = attachmentsTreeField.addChildNode(0, "Attachments");
+                int id = attachmentsTreeField.addChildNode(0, resources.getString(LogicMailResource.MESSAGE_ATTACHMENTS));
                 for(int i=attachmentParts.length - 1; i>=0; --i) {
                         attachmentsTreeField.addChildNode(id, attachmentParts[i]);

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

@@ -60 +60 @@
 package org.logicprobe.LogicMail.util;
 
+import net.rim.device.api.system.EventLogger;
+import net.rim.device.api.ui.UiApplication;
+import net.rim.device.api.ui.component.Dialog;
+import net.rim.device.api.util.DataBuffer;
+
+import org.logicprobe.LogicMail.AppInfo;
+import org.logicprobe.LogicMail.conf.GlobalConfig;
+import org.logicprobe.LogicMail.conf.MailSettings;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+
 import java.util.Vector;
+
+import javax.microedition.io.Connector;
 import javax.microedition.io.SocketConnection;
 import javax.microedition.io.StreamConnection;
-import javax.microedition.io.Connector;
-import net.rim.device.api.system.EventLogger;
-import net.rim.device.api.ui.UiApplication;
-import net.rim.device.api.ui.component.Dialog;
-import org.logicprobe.LogicMail.AppInfo;
-import org.logicprobe.LogicMail.conf.GlobalConfig;
-import org.logicprobe.LogicMail.conf.MailSettings;
+
 
 /**
@@ -93 +99 @@
  */
 public class Connection {
+    /**
+     * Byte array holding carriage return and line feed
+     */
+    private static final byte[] CRLF = new byte[] { 13, 10 };
+
+    /**
+     * Holds a list of open connections
+     */
+    private static Vector openConnections = new Vector();
     private String serverName;
     private int serverPort;
@@ -104 +119 @@
     private boolean useWiFi;
     private int fakeAvailable = -1;
-    
-    /**
-     * Byte array holding carriage return and line feed
-     */
-    private static final byte[] CRLF = new byte[] {13, 10};
-    
+
     /**
      * Provides a buffer used for incoming data.
      */
     private byte[] buffer = new byte[128];
-    
-    /**
-     * Holds a list of open connections
-     */
-    private static Vector openConnections = new Vector();
-    
-    public Connection(String serverName, int serverPort, boolean useSSL, boolean deviceSide) {
+
+    /**
+     * Provides a dynamic buffer for building results
+     */
+    DataBuffer resultBuffer = new DataBuffer();
+
+    public Connection(String serverName, int serverPort, boolean useSSL,
+        boolean deviceSide) {
         this.serverName = serverName;
         this.serverPort = serverPort;
@@ -130 +141 @@
         this.globalConfig = MailSettings.getInstance().getGlobalConfig();
     }
-    
+
     /**
      * Opens a connection.
      */
-    public void open() throws IOException {
-        if(input != null || output != null || socket != null) {
+    public synchronized void open() throws IOException {
+        if ((input != null) || (output != null) || (socket != null)) {
             close();
         }
 
-        synchronized(openConnections) {
-            if(!openConnections.contains(this)) {
+        synchronized (openConnections) {
+            if (!openConnections.contains(this)) {
                 openConnections.addElement(this);
             }
         }
-        
+
         String protocolStr = (useSSL ? "ssl" : "socket");
+
         // This parameter, which allows bypassing the MDS proxy, should probably
         // be a global user configurable option
@@ -151 +163 @@
 
         useWiFi = false;
-        if(globalConfig.getWifiMode() == GlobalConfig.WIFI_PROMPT) {
+
+        if (globalConfig.getWifiMode() == GlobalConfig.WIFI_PROMPT) {
             UiApplication.getUiApplication().invokeAndWait(new Runnable() {
-                public void run() {
-                    useWiFi = (Dialog.ask(Dialog.D_YES_NO, "Connect through WiFi?") == Dialog.YES);
-                }
-            });
-        }
-        else if(globalConfig.getWifiMode() == GlobalConfig.WIFI_ALWAYS) {
+                    public void run() {
+                        useWiFi = (Dialog.ask(Dialog.D_YES_NO,
+                                "Connect through WiFi?") == Dialog.YES);
+                    }
+                });
+        } else if (globalConfig.getWifiMode() == GlobalConfig.WIFI_ALWAYS) {
             useWiFi = true;
         }
-        
-        if(useWiFi) {
+
+        if (useWiFi) {
             paramStr = paramStr + ";interface=wifi";
         }
-        
-        String connectStr = protocolStr + "://" + serverName + ":" + serverPort + paramStr;
-        
-        if(EventLogger.getMinimumLevel() >= EventLogger.INFORMATION) {
-            String msg = "Opening connection:\r\n"+connectStr+"\r\n";
-            EventLogger.logEvent(AppInfo.GUID, msg.getBytes(), EventLogger.INFORMATION);
-        }
-        
-        socket = (StreamConnection)Connector.open(connectStr, Connector.READ_WRITE, true);
+
+        String connectStr = protocolStr + "://" + serverName + ":" +
+            serverPort + paramStr;
+
+        if (EventLogger.getMinimumLevel() >= EventLogger.INFORMATION) {
+            String msg = "Opening connection:\r\n" + connectStr + "\r\n";
+            EventLogger.logEvent(AppInfo.GUID, msg.getBytes(),
+                EventLogger.INFORMATION);
+        }
+
+        socket = (StreamConnection) Connector.open(connectStr,
+                Connector.READ_WRITE, true);
         input = socket.openDataInputStream();
         output = socket.openDataOutputStream();
-        localAddress = ((SocketConnection)socket).getLocalAddress();
-
-        if(EventLogger.getMinimumLevel() >= EventLogger.INFORMATION) {
-            String msg =
-                "Connection established:\r\n"+
-                "Socket: "+socket.getClass().toString()+"\r\n"+
-                "Local address: "+localAddress+"\r\n";
-            EventLogger.logEvent(AppInfo.GUID, msg.getBytes(), EventLogger.INFORMATION);
-        }
-    }
-    
+        localAddress = ((SocketConnection) socket).getLocalAddress();
+
+        if (EventLogger.getMinimumLevel() >= EventLogger.INFORMATION) {
+            String msg = "Connection established:\r\n" + "Socket: " +
+                socket.getClass().toString() + "\r\n" + "Local address: " +
+                localAddress + "\r\n";
+            EventLogger.logEvent(AppInfo.GUID, msg.getBytes(),
+                EventLogger.INFORMATION);
+        }
+    }
+
     /**
      * Closes a connection.
      */
-    public void close() throws IOException {
+    public synchronized void close() throws IOException {
         try {
-            if(input != null) {
+            if (input != null) {
                 input.close();
                 input = null;
@@ -199 +215 @@
             input = null;
         }
+
         try {
-            if(output != null) {
+            if (output != null) {
                 output.close();
                 output = null;
@@ -207 +224 @@
             output = null;
         }
+
         try {
-            if(socket != null) {
+            if (socket != null) {
                 socket.close();
                 socket = null;
@@ -216 +234 @@
         }
 
-        synchronized(openConnections) {
-            if(openConnections.contains(this)) {
+        synchronized (openConnections) {
+            if (openConnections.contains(this)) {
                 openConnections.removeElement(this);
             }
         }
-        
-        EventLogger.logEvent(AppInfo.GUID, "Connection closed".getBytes(), EventLogger.INFORMATION);
-    }
-    
+
+        EventLogger.logEvent(AppInfo.GUID, "Connection closed".getBytes(),
+            EventLogger.INFORMATION);
+    }
+
     /**
      * Determine whether open connections exist
@@ -232 +251 @@
     public static boolean hasOpenConnections() {
         boolean result;
-        synchronized(openConnections) {
+
+        synchronized (openConnections) {
             result = !openConnections.isEmpty();
         }
+
         return result;
     }
-    
+
     /**
      * Close all open connections
      */
     public static void closeAllConnections() {
-        synchronized(openConnections) {
+        synchronized (openConnections) {
             int size = openConnections.size();
-            for(int i = 0; i < size; i++) {
+
+            for (int i = 0; i < size; i++) {
                 try {
-                    ((Connection)openConnections.elementAt(i)).close();
-                } catch (IOException e) { }
-            }
+                    ((Connection) openConnections.elementAt(i)).close();
+                } catch (IOException e) {
+                }
+            }
+
             openConnections.removeAllElements();
         }
     }
-    
+
     /**
      * Determine whether we are currently connected
@@ -258 +282 @@
      */
     public boolean isConnected() {
-        if(socket != null)
+        if (socket != null) {
             return true;
-        else
+        } else {
             return false;
-    }
-    
+        }
+    }
+
     /**
      * Get the local address to which this connection is bound
@@ -271 +296 @@
         return localAddress;
     }
-    
+
     /**
      * Get the server name used when this connection was created
@@ -279 +304 @@
         return serverName;
     }
-    
+
     /**
      * Sends a string to the server. This method is used internally for
@@ -289 +314 @@
      * @see #receive
      */
-    public void send(String s) throws IOException {
+    public synchronized void send(String s) throws IOException {
         byte[] bytes = s.getBytes();
         int length = bytes.length;
-        
+
         /**
          * Special case for empty strings: Only CR/LF is sent.
          */
         if (s.length() == 0) {
-            if(globalConfig.getConnDebug()) {
-                EventLogger.logEvent(AppInfo.GUID, "[SEND]".getBytes(), EventLogger.DEBUG_INFO);
-            }
-            
+            if (globalConfig.getConnDebug()) {
+                EventLogger.logEvent(AppInfo.GUID, "[SEND]".getBytes(),
+                    EventLogger.DEBUG_INFO);
+            }
+
             output.write(CRLF, 0, 2);
         }
@@ -308 +334 @@
         else {
             int i = 0;
+
             while (i < length) {
                 int j = i;
-                
+
                 /**
                  * Find next occurrence of a line separator or the end of the
                  * string.
                  */
-                while ((j < length) && (bytes[j] != 0x0A) && (bytes[j] != 0x0D)) {
+                while ((j < length) && (bytes[j] != 0x0A) &&
+                        (bytes[j] != 0x0D)) {
                     j++;
                 }
-                
-                if(globalConfig.getConnDebug()) {
-                    EventLogger.logEvent(AppInfo.GUID, ("[SEND] " + s.substring(i, j)).getBytes(), EventLogger.DEBUG_INFO);
-                }
-                
+
+                if (globalConfig.getConnDebug()) {
+                    EventLogger.logEvent(AppInfo.GUID,
+                        ("[SEND] " + s.substring(i, j)).getBytes(),
+                        EventLogger.DEBUG_INFO);
+                }
+
                 /**
                  * Write the string up to there and terminate it properly.
                  */
-                output.write((s.substring(i, j)+"\r\n").getBytes());
-                
+                output.write((s.substring(i, j) + "\r\n").getBytes());
+
                 /**
                  * If we stopped at a CR, ignore a possibly following LF.
                  */
-                if ((j < length - 1) && (bytes[j] == 0x0D) && (bytes[j + 1] == 0x0A)) {
+                if ((j < (length - 1)) && (bytes[j] == 0x0D) &&
+                        (bytes[j + 1] == 0x0A)) {
                     j++;
                 }
-                
+
                 i = j + 1;
             }
         }
+
         output.flush();
     }
-    
+
     /**
      * Sends a string to the server, terminating it with a CRLF.
@@ -346 +378 @@
      * is a prepared protocol command.
      */
-    public void sendCommand(String s) throws IOException {
-        if(globalConfig.getConnDebug()) {
-            EventLogger.logEvent(AppInfo.GUID, ("[SEND CMD] " + s).getBytes(), EventLogger.DEBUG_INFO);
-        }
-
-        if(s == null) {
+    public synchronized void sendCommand(String s) throws IOException {
+        if (globalConfig.getConnDebug()) {
+            EventLogger.logEvent(AppInfo.GUID, ("[SEND CMD] " + s).getBytes(),
+                EventLogger.DEBUG_INFO);
+        }
+
+        if (s == null) {
             output.write(CRLF, 0, 2);
-        }
-        else {
-            output.write((s+"\r\n").getBytes());
-        }
+        } else {
+            output.write((s + "\r\n").getBytes());
+        }
+
         output.flush();
     }
-    
+
     /**
      * Sends a string to the server. This method is used to bypass all
@@ -368 +401 @@
      * @see #send
      */
-    public void sendRaw(String s) throws IOException {
+    public synchronized void sendRaw(String s) throws IOException {
         byte[] bytes = s.getBytes();
-        
-        if(globalConfig.getConnDebug()) {
-            EventLogger.logEvent(AppInfo.GUID, ("[SEND RAW]\r\n" + s).getBytes(), EventLogger.DEBUG_INFO);
-        }
-        
+
+        if (globalConfig.getConnDebug()) {
+            EventLogger.logEvent(AppInfo.GUID,
+                ("[SEND RAW]\r\n" + s).getBytes(), EventLogger.DEBUG_INFO);
+        }
+
         output.write(bytes, 0, bytes.length);
-        
+
         output.flush();
     }
@@ -383 +417 @@
      * 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;
-        }
-    }
-    
+        if (fakeAvailable == -1) {
+            return input.available();
+        } else {
+            return fakeAvailable;
+        }
+    }
+
     /**
      * Receives a string from the server. This method is used internally for
@@ -404 +437 @@
      * @see #send
      */
-    public String receive() throws IOException {
+    public synchronized String receive() throws IOException {
         /**
          * A note on how this method works and why it is designed the
@@ -432 +465 @@
          * but there's not much one can about that.
          */
-        StringBuffer resultBuffer = new StringBuffer();
         boolean stop = false;
+        resultBuffer.reset();
+
         int actualAvailable = input.available();
         int readBytes = 0;
         int count;
-        
+
         /**
          * The "stop" flag will be set as soon as we have received
@@ -445 +479 @@
         while (!stop) {
             count = 0;
-            
+
             /**
              * The inner block reads single bytes from the InputStream
@@ -453 +487 @@
             while (true) {
                 int actual = input.read(buffer, count, 1);
-                
+
                 /**
                  * If -1 is returned, the InputStream is already closed,
@@ -461 +495 @@
                  */
                 if (actual == -1) {
-                    EventLogger.logEvent(AppInfo.GUID, "Unable to read from socket, closing connection".getBytes(), EventLogger.INFORMATION);
+                    EventLogger.logEvent(AppInfo.GUID,
+                        "Unable to read from socket, closing connection".getBytes(),
+                        EventLogger.INFORMATION);
+
                     try {
                         close();
-                    } catch (IOException e) { }
-                    
+                    } catch (IOException e) {
+                    }
+
                     throw new IOException("Connection closed");
                 }
-                
                 /**
                  * If no bytes have been received, we wait a little
@@ -476 +513 @@
                     try {
                         Thread.yield();
-                    } catch (Exception e) { }
-                }
-                
+                    } catch (Exception e) {
+                    }
+                }
                 /**
                  * If a byte has been read, examine it and put it in the
                  * buffer.
                  */
+
                 // Note: We really should look for CRLF, and not use this
                 // approach which screws up on mid-line LFs. (DK)
@@ -488 +526 @@
                     byte b = buffer[count];
                     readBytes++;
-                    
+
                     /**
                      * Ignore all CRs.
@@ -500 +538 @@
                     else if (b == 0x0A) {
                         stop = true;
+
                         break;
                     }
@@ -507 +546 @@
                     else {
                         count++;
+
                         if (count == buffer.length) {
                             break;
@@ -513 +553 @@
                 }
             }
-            resultBuffer.append(new String(buffer, 0, count));
-        }
-        
-        if(globalConfig.getConnDebug()) {
-            EventLogger.logEvent(AppInfo.GUID, ("[RECV] " + resultBuffer.toString()).getBytes(), EventLogger.DEBUG_INFO);
-        }
-        if(actualAvailable > readBytes) {
-                fakeAvailable = actualAvailable - readBytes;
-        }
-        else {
-                fakeAvailable = -1;
-        }
-        
-        return resultBuffer.toString();
+
+            resultBuffer.write(buffer, 0, count);
+        }
+
+        String result = new String(resultBuffer.toArray());
+
+        if (globalConfig.getConnDebug()) {
+            EventLogger.logEvent(AppInfo.GUID,
+                ("[RECV] " + result).getBytes(),
+                EventLogger.DEBUG_INFO);
+        }
+
+        if (actualAvailable > readBytes) {
+            fakeAvailable = actualAvailable - readBytes;
+        } else {
+            fakeAvailable = -1;
+        }
+
+        return result;
     }
 }
-