Changeset 287

Timestamp:

09/27/08 03:46:42 PM (3 months ago)

Author:

octorian

Message:

Added configurable local hostname for SMTP issue (#102)

Location:

branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail

Files:

• conf/GlobalConfig.java (modified) (5 diffs)
• mail/smtp/SmtpClient.java (modified) (1 diff)
• ui/GlobalConfigScreen.java (modified) (5 diffs)

branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/conf/GlobalConfig.java

@@ -60 +60 @@
     /** Hide deleted messages */
     private boolean hideDeletedMsg;
+    /** Local host name override */
+    private String localHostname;
 
     /** WiFi support is disabled, best for non-WiFi devices */
@@ -90 +92 @@
         this.wifiMode = GlobalConfig.WIFI_DISABLED;
         this.hideDeletedMsg = true;
+        this.localHostname = "";
     }
     
@@ -155 +158 @@
         this.hideDeletedMsg = hideDeletedMsg;
     }
-     
+
+    public String getLocalHostname() {
+        return this.localHostname;
+    }
+    
+    public void setLocalHostname(String localHostname) {
+        this.localHostname = localHostname;
+    }
+    
     public void serialize(DataOutputStream output) throws IOException {
         output.writeLong(uniqueId);
@@ -169 +180 @@
         table.put("global_connDebug", new Boolean(connDebug));
         table.put("global_hideDeletedMsg", new Boolean(hideDeletedMsg));
+        table.put("global_localHostname", localHostname);
 
         table.serialize(output);
@@ -214 +226 @@
             hideDeletedMsg = ((Boolean)value).booleanValue();
         }
+        value = table.get("global_localHostname");
+        if(value != null && value instanceof String) {
+            localHostname = (String)value;
+        }
     }
 

branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/mail/smtp/SmtpClient.java

@@ -89 +89 @@
             // Eat the initial server response
             connection.receive();
-            String hostname = System.getProperty("microedition.hostname");
-            if(hostname == null) {
-                hostname = connection.getLocalAddress();
+            
+            String hostname = globalConfig.getLocalHostname();
+            if(hostname.length() == 0) {
+                hostname = System.getProperty("microedition.hostname");
+                if(hostname == null) {
+                    hostname = connection.getLocalAddress();
+                }
             }
 

branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/ui/GlobalConfigScreen.java

@@ -57 +57 @@
     private CheckboxField fldConnDebug;
     private CheckboxField fldHideDeletedMsg;
+    private CheckboxField fldOverrideHostname;
+    private BasicEditField fldLocalHostname;
     private ButtonField btSave;
+    private String localHostname;
 
     public GlobalConfigScreen() {
@@ -64 +67 @@
         mailSettings = MailSettings.getInstance();
         GlobalConfig config = mailSettings.getGlobalConfig();
-
+        localHostname = config.getLocalHostname();
+        
         add(new RichTextField("Global settings:", Field.NON_FOCUSABLE));
         
@@ -100 +104 @@
         add(fldPopMaxLines);
 
+        boolean overrideHostname = localHostname.length() > 0;
+        fldOverrideHostname = new CheckboxField("Override hostname", overrideHostname);
+        fldOverrideHostname.setChangeListener(this);
+        add(fldOverrideHostname);
+        
+        if(overrideHostname) {
+            fldLocalHostname = new BasicEditField("  Hostname: ", localHostname);
+        }
+        else {
+            String hostname = System.getProperty("microedition.hostname");
+            fldLocalHostname = new BasicEditField("  Hostname: ", ((hostname != null) ? hostname : "localhost"));
+            fldLocalHostname.setEditable(false);
+        }
+        add(fldLocalHostname);
+        
         fldConnDebug = new CheckboxField("Connection debugging", config.getConnDebug());
         add(fldConnDebug);
@@ -113 +132 @@
         if(field == btSave) {
             onClose();
+        }
+        else if(field == fldOverrideHostname) {
+            if(fldOverrideHostname.getChecked()) {
+                fldLocalHostname.setText(localHostname);
+                fldLocalHostname.setEditable(true);
+            }
+            else {
+                String hostname = System.getProperty("microedition.hostname");
+                fldLocalHostname.setText((hostname != null) ? hostname : "localhost");
+                fldLocalHostname.setEditable(false);
+            }
         }
     }
@@ -141 +171 @@
             config.setPopMaxLines(Integer.parseInt(fldPopMaxLines.getText()));
         } catch (Exception e) { }
+        
+        if(fldOverrideHostname.getChecked()) {
+            config.setLocalHostname(fldLocalHostname.getText().trim());
+        }
+        else {
+            config.setLocalHostname("");
+        }
+        
         config.setConnDebug(fldConnDebug.getChecked());
         mailSettings.saveSettings();