Version jPskmail-3.1.8.4-20230830-Beta (unpublished)

- Bug fix:  When listening in CW mode for unproto exchanges, would reply to a connect request in CW mode.
- Improvement: when listening in CW mode, disable the Fldigi Squelch as it creates characters dropouts
- Bug fix: "I don't understand "~SEND" reply when requesting Grib files
- Bug fix: When using virtual mail boxes, grib file replies would not be visible to the requester due to the reply coming from a different email address. 
- Bug fix: Endless reties of some data frames due to the presence of control characters not processed on the Rx side ("0x0D" is ignored). This also resulted in corrupted multibytes UTF-8 characters in emails and web pages.
- Bug fix: When transmitting multibytes UTF-8 frames, Fldigi would be killed and restarted due to a Tx timeout. Now counts the number of bytes instead of characters for calculating the timeout.

Author: VK2ETA

src/javapskmail/Arq.java

@@ -550,6 +550,8 @@ public boolean send_ack(String server) {
         //VK2ETA not automatically, decided elsewhere
         //send_txrsid_command("ON");
         //test Thread.sleep(1000);
+        //Ensure we don't leave an old status here like a CW ack status
+        this.txserverstatus = TxStatus.TTYConnect_ack;
         info = connect_ack(server);
         outstring = make_block(info);
         if (Main.ttyConnected.equals("Connecting")) { //I am a TTY server

src/javapskmail/Main.java

@@ -34,9 +34,9 @@
 public class Main {
 
     //VK2ETA: Based on "jpskmail 1.7.b";
-    static String version = "3.1.8.1";
+    static String version = "3.1.8.4";
     static String application = "jPskmail " + version;// Used to preset an empty status
-    static String versionDate = "20230826";
+    static String versionDate = "20230830";
     static String host = "localhost";
     static int port = 7322; //ARQ IP port
     static String xmlPort = "7362"; //XML IP port

src/javapskmail/MainPskmailUi.java

@@ -638,7 +638,8 @@ public void actionPerformed(ActionEvent e) {
                             //Squelch fully open when actively listening
                             if (Main.connected || Main.m.BlockActive
                                     || Main.receivingRadioMsg || Main.possibleRadioMsg != 0L 
-                                    || Main.modemTestMode) {
+                                    || Main.modemTestMode 
+                                    || Main.configuration.getPreference("LISTENINCWMODE").equals("yes")) {
                                 Main.sql = Main.SQL_FLOOR;
                                 RigCtrl.setSquelchOn(false); //OFF
                             } else {

src/javapskmail/Modem.java

@@ -682,7 +682,7 @@ public void Sendln(String outLine) {
                         Main.justReceivedRSID = false;
                         //Calculate the expected return time to Rx (to prevent TX lockups). Add 50% margin.
                         //expectedReturnToRxTime = System.currentTimeMillis() + (3000 * (long) (getTxTimeEstimate(Main.txModem, outLine.length()))) / 2;
-                        long txTime = (3000 * (long)(getTxTimeEstimate(Main.txModem, outLine.length())))/2;
+                        long txTime = (3000 * (long)(getTxTimeEstimate(Main.txModem, outLine.getBytes("UTF-8").length)));
                         System.out.println("txTime: " + txTime);
                         expectedReturnToRxTime = System.currentTimeMillis() + txTime;
                     }
@@ -727,7 +727,7 @@ public void Sendln(String outLine, String modemString, String TxRsidString) {
                             Main.justReceivedRSID = false;
                             ModemModesEnum txMode = Main.convmodem(modemString);
                             //Calculate the expected return time to Rx (to prevent TX lockups). Add 50% margin.
-                            long txTime = (3000 * (long)(getTxTimeEstimate(txMode, outLine.length())))/2;
+                            long txTime = (3000 * (long)(getTxTimeEstimate(txMode, outLine.getBytes("UTF-8").length)));
                             System.out.println("txTime: " + txTime);
                             expectedReturnToRxTime = System.currentTimeMillis() + txTime;
                         }

src/javapskmail/ServerMail.java

@@ -73,6 +73,7 @@ public class ServerMail {
     2nd line
     3rd line
     4th line.
+    .
     .
      */    
     public static String sendMail(String fromCallsign, String toStr, String subjectStr,
@@ -268,6 +269,11 @@ public static String getHeaderList(int fromNumber) {
                     String fromString = msg.getFrom()[0].toString();
                     //Remove name and only keep email address proper
                     fromString = RMsgProcessor.extractEmailAddress(fromString);
+                    //Special case for GRIB files replies: grib requests are sent to "query@saildocs.com" but 
+                    //  replies are coming from "query-reply@saildocs.com", thereby never matching the filter
+                    if (fromString.equals("query-reply@saildocs.com")) {
+                        fromString = "query@saildocs.com";
+                    }
                     String[] tos;
                     //boolean forAll = false;
                     //if (forAll) {
@@ -310,7 +316,7 @@ public static String getHeaderList(int fromNumber) {
                                 //VK2ETA UTF-8 full support now
                                 //String subjectStr = msg.getSubject().replaceAll("\u2013", "-");
                                 //subjectStr = subjectStr.replaceAll("[^a-zA-Z0-9\\n\\s\\<\\>\\!\\[\\]\\{\\}\\:\\;\\\\\'\"\\/\\?\\=\\+\\-\\_\\@\\#\\+\\$\\%\\^\\&\\*,\\.\\(\\)\\|]", "~");
-                                String subjectStr = msg.getSubject();
+                                String subjectStr = msg.getSubject().replaceAll("\r", ""); //Remove carriage returns
                                 //JavaMail .getSize() is not accurate. Get body size and add to the header size
                                 String emailBody = getEmailTextFromMessage(msg);
                                 int mSize = emailBody.length() + fromString.length() + subjectStr.length();
@@ -371,9 +377,9 @@ public static String getHeaderList(int fromNumber) {
                     //VK2ETA UTF-8 full support now
                     //String subjectStr = messages[i].getSubject().replaceAll("\u2013", "-");
                     //subjectStr = subjectStr.replaceAll("[^a-zA-Z0-9\\n\\s\\<\\>\\!\\[\\]\\{\\}\\:\\;\\\\\'\"\\/\\?\\=\\+\\-\\_\\@\\#\\+\\$\\%\\^\\&\\*,\\.\\(\\)\\|]", "~");
-                    String subjectStr = messages[i].getSubject();
+                    String subjectStr = messages[i].getSubject().replaceAll("\r", ""); //Remove carriage returns;
                     //JavaMail .getSize() is not accurate. Get body size and add to the header size
-                    String emailBody = getEmailTextFromMessage(messages[i]);
+                    String emailBody = getEmailTextFromMessage(messages[i]).replaceAll("\r", ""); //Remove carriage returns;;
                     int mSize = emailBody.length() + fromString.length() + subjectStr.length();
                     //VK2ETA: check if Perl server adds a space before the email number
                     mailHeaders += "" + (i + 1) + " " + fromString + "  " + subjectStr + " " + mSize + "\n";
@@ -474,6 +480,11 @@ public static int getMailCount(String reqCallSign) {
                         String fromString = msg.getFrom()[0].toString();
                         //Remove name and only keep email address proper
                         fromString = RMsgProcessor.extractEmailAddress(fromString);
+                                            //Special case for GRIB files replies: grib requests are sent to "query@saildocs.com" but 
+                        //  replies are coming from "query-reply@saildocs.com", thereby never matching the filter
+                        if (fromString.equals("query-reply@saildocs.com")) {
+                            fromString = "query@saildocs.com";
+                        }
                         String[] tos;
                         //boolean forAll = false;
                         //if (forAll) {
@@ -759,6 +770,11 @@ public static String readMail(int emailNumber, boolean compressedMail) {
                     String fromString = msg.getFrom()[0].toString();
                     //Remove name and only keep email address proper
                     fromString = RMsgProcessor.extractEmailAddress(fromString);
+                    //Special case for GRIB files replies: grib requests are sent to "query@saildocs.com" but 
+                    //  replies are coming from "query-reply@saildocs.com", thereby never matching the filter
+                    if (fromString.equals("query-reply@saildocs.com")) {
+                        fromString = "query@saildocs.com";
+                    }
                     String[] tos;
                     //boolean forAll = false;
                     //if (forAll) {
@@ -823,7 +839,7 @@ public static String readMail(int emailNumber, boolean compressedMail) {
                     //VK2ETA full UTF-8 support
                     //returnString = getEmailTextFromMessage(storedMessage).replaceAll("\u2013", "-");
                     //returnString = returnString.replaceAll("[^a-zA-Z0-9\\n\\s\\<\\>\\!\\[\\]\\{\\}\\:\\;\\\\\'\"\\/\\?\\=\\+\\-\\_\\@\\#\\+\\$\\%\\^\\&\\*,\\.\\(\\)\\|]", "~");
-                    returnString = getEmailTextFromMessage(storedMessage);
+                    returnString = getEmailTextFromMessage(storedMessage).replaceAll("\r", ""); //Remove carriage returns;
                     //Provide lead, size and end marker
                     returnString = "Your msg: " + returnString.length() + "\n"
                             + returnString + "\n-end-\n";
@@ -1004,6 +1020,11 @@ public static String deleteMail(int emailNumber) {
                     String fromString = msg.getFrom()[0].toString();
                     //Remove name and only keep email address proper
                     fromString = RMsgProcessor.extractEmailAddress(fromString);
+                                        //Special case for GRIB files replies: grib requests are sent to "query@saildocs.com" but 
+                    //  replies are coming from "query-reply@saildocs.com", thereby never matching the filter
+                    if (fromString.equals("query-reply@saildocs.com")) {
+                        fromString = "query@saildocs.com";
+                    }
                     String[] tos;
                     //boolean forAll = false;
                     //if (forAll) {

src/javapskmail/Session.java

@@ -1019,7 +1019,7 @@ public void parseInput(String str) throws NoClassDefFoundError, FileNotFoundExce
         }
 
         //send mail (~SEND)
-        Pattern SMp = Pattern.compile("^(~SEND)$");
+        Pattern SMp = Pattern.compile("^\\s*(~SEND)$");
         Matcher smm = SMp.matcher(str);
         if (Main.ttyConnected.equals("Connected") & smm.lookingAt()) {
             foundMatchingCommand = true;