Changeset 284

Timestamp:

09/04/08 09:06:14 PM (4 months ago)

Author:

octorian

Message:

Merge of fixes

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail

Files:

• mail/smtp/SmtpClient.java (modified) (9 diffs)
• util/StringParser.java (modified) (2 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/smtp/SmtpClient.java

@@ -8 +8 @@
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution. 
+ *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the project nor the names of its
  *    contributors may be used to endorse or promote products derived
@@ -29 +29 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 package org.logicprobe.LogicMail.mail.smtp;
 
-import java.io.IOException;
-import java.util.Calendar;
 import org.logicprobe.LogicMail.AppInfo;
 import org.logicprobe.LogicMail.conf.ConnectionConfig;
@@ -49 +46 @@
 import org.logicprobe.LogicMail.util.StringParser;
 
+import java.io.IOException;
+
+import java.util.Calendar;
+
+
 /**
  * Implements an SMTP client
  */
 public class SmtpClient implements OutgoingMailClient {
+    private static String strCRLF = "\r\n";
     private OutgoingConfig outgoingConfig;
     private Connection connection;
@@ -61 +64 @@
     private String password;
     private boolean configChanged;
-    private static String strCRLF = "\r\n";
-    
+    private MailSettingsListener mailSettingsListener = new MailSettingsListener() {
+            public void mailSettingsSaved(MailSettingsEvent e) {
+                mailSettings_MailSettingsSaved(e);
+            }
+        };
+
     /** Creates a new instance of SmtpClient */
     public SmtpClient(GlobalConfig globalConfig, OutgoingConfig outgoingConfig) {
         this.outgoingConfig = outgoingConfig;
-        connection = new Connection(
-            outgoingConfig.getServerName(),
-            outgoingConfig.getServerPort(),
-            outgoingConfig.getServerSSL(),
-            outgoingConfig.getDeviceSide());
+        connection = new Connection(outgoingConfig.getServerName(),
+                outgoingConfig.getServerPort(), outgoingConfig.getServerSSL(),
+                outgoingConfig.getDeviceSide());
         smtpProtocol = new SmtpProtocol(connection);
 
-        if(outgoingConfig.getUseAuth() > 0) {
+        if (outgoingConfig.getUseAuth() > 0) {
             username = outgoingConfig.getServerUser();
             password = outgoingConfig.getServerPass();
-        }
-        else {
+        } else {
             username = null;
             password = null;
         }
+
         openStarted = false;
         configChanged = false;
         MailSettings.getInstance().addMailSettingsListener(mailSettingsListener);
     }
-    private MailSettingsListener mailSettingsListener = new MailSettingsListener() {
-                public void mailSettingsSaved(MailSettingsEvent e) {
-                        mailSettings_MailSettingsSaved(e);
-                }
-    };
-    
+
     private void mailSettings_MailSettingsSaved(MailSettingsEvent e) {
-                if(MailSettings.getInstance().containsOutgoingConfig(outgoingConfig)) {
-                        // Refresh authentication information from the configuration
-                username = outgoingConfig.getServerUser();
-                password = outgoingConfig.getServerPass();
-                
-                if(!isConnected()) {
-                        // Rebuild the connection to include new settings
-                    connection = new Connection(
-                                outgoingConfig.getServerName(),
-                                outgoingConfig.getServerPort(),
-                                outgoingConfig.getServerSSL(),
-                                outgoingConfig.getDeviceSide());
-                    smtpProtocol = new SmtpProtocol(connection);
-                }
-                else {
-                        // Set a flag to make sure we rebuild the Connection object
-                        // the next time we close the connection.
-                        configChanged = true;
-                }
-                }
-                else {
-                        // We have been deleted, so unregister to make sure we
-                        // no longer affect the system and can be garbage collected.
-                        MailSettings.getInstance().removeMailSettingsListener(mailSettingsListener);
-                }
+        if (MailSettings.getInstance().containsOutgoingConfig(outgoingConfig)) {
+            // Refresh authentication information from the configuration
+            username = outgoingConfig.getServerUser();
+            password = outgoingConfig.getServerPass();
+
+            if (!isConnected()) {
+                // Rebuild the connection to include new settings
+                connection = new Connection(outgoingConfig.getServerName(),
+                        outgoingConfig.getServerPort(),
+                        outgoingConfig.getServerSSL(),
+                        outgoingConfig.getDeviceSide());
+                smtpProtocol = new SmtpProtocol(connection);
+            } else {
+                // Set a flag to make sure we rebuild the Connection object
+                // the next time we close the connection.
+                configChanged = true;
+            }
+        } else {
+            // We have been deleted, so unregister to make sure we
+            // no longer affect the system and can be garbage collected.
+            MailSettings.getInstance().removeMailSettingsListener(mailSettingsListener);
+        }
     }
 
     public boolean open() throws IOException, MailException {
-        if(!openStarted) {
+        if (!openStarted) {
             connection.open();
 
             // Eat the initial server response
             connection.receive();
+
             String hostname = System.getProperty("microedition.hostname");
-            if(hostname == null) {
-                hostname = "localhost";
+
+            if (hostname == null) {
+                hostname = connection.getLocalAddress();
             }
 
@@ -133 +132 @@
             openStarted = true;
         }
-        if(outgoingConfig.getUseAuth() > 0) {
-            boolean result = smtpProtocol.executeAuth(outgoingConfig.getUseAuth(), username, password);
-            if(!result) {
+
+        if (outgoingConfig.getUseAuth() > 0) {
+            boolean result = smtpProtocol.executeAuth(outgoingConfig.getUseAuth(),
+                    username, password);
+
+            if (!result) {
                 return false;
             }
         }
+
         isFresh = true;
         openStarted = false;
+
         return true;
     }
@@ -146 +150 @@
     public void close() throws IOException, MailException {
         try {
-           smtpProtocol.executeQuit();
-        } catch (Exception exp) { }
+            smtpProtocol.executeQuit();
+        } catch (Exception exp) {
+        }
+
         connection.close();
-        
-        if(configChanged) {
-                // Rebuild the connection to include new settings
-            connection = new Connection(
-                        outgoingConfig.getServerName(),
-                        outgoingConfig.getServerPort(),
-                        outgoingConfig.getServerSSL(),
-                        outgoingConfig.getDeviceSide());
+
+        if (configChanged) {
+            // Rebuild the connection to include new settings
+            connection = new Connection(outgoingConfig.getServerName(),
+                    outgoingConfig.getServerPort(),
+                    outgoingConfig.getServerSSL(),
+                    outgoingConfig.getDeviceSide());
             smtpProtocol = new SmtpProtocol(connection);
             configChanged = false;
@@ -163 +168 @@
 
     public ConnectionConfig getConnectionConfig() {
-                return outgoingConfig;
-        }
+        return outgoingConfig;
+    }
 
     public boolean isConnected() {
@@ -186 +191 @@
     }
 
-    public String sendMessage(Message message) throws IOException, MailException {
-        if(!isFresh) {
+    public String sendMessage(Message message)
+        throws IOException, MailException {
+        if (!isFresh) {
             smtpProtocol.executeReset();
         }
+
         isFresh = false;
-        
+
         // serialize the message
         MessageMimeConverter messageMime = new MessageMimeConverter();
         message.getBody().accept(messageMime);
+
         String mimeStr = messageMime.toMimeString();
-        
+
         MessageEnvelope env = message.getEnvelope();
         StringBuffer buffer = new StringBuffer();
@@ -203 +211 @@
         buffer.append("From: " + makeCsvString(env.from) + strCRLF);
         buffer.append("To: " + makeCsvString(env.to) + strCRLF);
-        if(env.cc != null && env.cc.length > 0) {
+
+        if ((env.cc != null) && (env.cc.length > 0)) {
             buffer.append("Cc: " + makeCsvString(env.cc) + strCRLF);
         }
-        if(env.replyTo != null && env.replyTo.length > 0) {
+
+        if ((env.replyTo != null) && (env.replyTo.length > 0)) {
             buffer.append("Reply-To: " + makeCsvString(env.replyTo) + strCRLF);
         }
-        buffer.append("Date: " + StringParser.createDateString(Calendar.getInstance().getTime()) + strCRLF);
-        buffer.append("User-Agent: "+AppInfo.getName()+"/"+AppInfo.getVersion() + strCRLF);
+
+        buffer.append("Date: " +
+            StringParser.createDateString(Calendar.getInstance().getTime()) +
+            strCRLF);
+        buffer.append("User-Agent: " + AppInfo.getName() + "/" +
+            AppInfo.getVersion() + strCRLF);
         buffer.append("Subject: " + env.subject + strCRLF);
-        
-        if(env.inReplyTo != null) {
+
+        if (env.inReplyTo != null) {
             buffer.append("In-Reply-To: " + env.inReplyTo + strCRLF);
         }
-        
+
         // Add the body
         buffer.append(mimeStr);
 
         // Send the message
-        if(!smtpProtocol.executeMail(stripEmail(env.from[0]))) {
+        if (!smtpProtocol.executeMail(stripEmail(env.from[0]))) {
             throw new MailException("Error with sender");
         }
-        for(int i=0; i<env.to.length; i++) {
-            if(!smtpProtocol.executeRecipient(stripEmail(env.to[i]))) {
+
+        for (int i = 0; i < env.to.length; i++) {
+            if (!smtpProtocol.executeRecipient(stripEmail(env.to[i]))) {
                 throw new MailException("Error with recipient");
             }
         }
-        if(env.cc != null) {
-            for(int i=0; i<env.cc.length; i++) {
-                if(!smtpProtocol.executeRecipient(stripEmail(env.cc[i]))) {
+
+        if (env.cc != null) {
+            for (int i = 0; i < env.cc.length; i++) {
+                if (!smtpProtocol.executeRecipient(stripEmail(env.cc[i]))) {
                     throw new MailException("Error with recipient");
                 }
             }
         }
-        if(env.bcc != null) {
-            for(int i=0; i<env.bcc.length; i++) {
-                if(!smtpProtocol.executeRecipient(stripEmail(env.bcc[i]))) {
+
+        if (env.bcc != null) {
+            for (int i = 0; i < env.bcc.length; i++) {
+                if (!smtpProtocol.executeRecipient(stripEmail(env.bcc[i]))) {
                     throw new MailException("Error with recipient");
                 }
             }
         }
-        
+
         String rawMessage = buffer.toString();
-        if(!smtpProtocol.executeData(rawMessage)) {
+
+        if (!smtpProtocol.executeData(rawMessage)) {
             throw new MailException("Error sending message");
         }
-        
+
         return rawMessage;
     }
-    
+
     private static String makeCsvString(String[] input) {
-        if(input == null || input.length == 0)
+        if ((input == null) || (input.length == 0)) {
             return "";
-        else if(input.length == 1)
+        } else if (input.length == 1) {
             return input[0];
-        else {
+        } else {
             StringBuffer buffer = new StringBuffer();
-            for(int i=0; i<input.length-1; i++) {
+
+            for (int i = 0; i < (input.length - 1); i++) {
                 buffer.append(input[i]);
                 buffer.append(", ");
             }
-            buffer.append(input[input.length-1]);
+
+            buffer.append(input[input.length - 1]);
+
             return buffer.toString();
         }
     }
-    
+
     private static String stripEmail(String input) {
         int p = input.indexOf('<');
         int q = input.indexOf('>');
-        if(p == -1 || q == -1 || q <= p)
+
+        if ((p == -1) || (q == -1) || (q <= p)) {
             return input;
-        else
-            return input.substring(p+1, q);
+        } else {
+            return input.substring(p + 1, q);
+        }
     }
 }

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

@@ -54 +54 @@
  */
 public class StringParser {
+    private static final long ONE_SECOND = 1000;
+    private static final long ONE_MINUTE = ONE_SECOND * 60;
+    private static final long ONE_HOUR = ONE_MINUTE * 60;
+
     private StringParser() {
     }
@@ -432 +436 @@
         buf.append(' ');
 
-        int tzOffset = (cal.getTimeZone().getRawOffset()) / 36000;
+        int tzOffset = cal.getTimeZone().getOffset(1, cal.get(Calendar.YEAR),
+                cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH),
+                cal.get(Calendar.DAY_OF_WEEK),
+                (int) (((long) cal.get(Calendar.HOUR_OF_DAY) * ONE_HOUR) +
+                (cal.get(Calendar.MINUTE) * ONE_MINUTE) +
+                (cal.get(Calendar.SECOND) * ONE_SECOND))) / 36000;
 
         if (tzOffset < 0) {