Version jPskmail-3.1.8.1-20230826-Beta (unpublished)

- Bug fixes for handling of UTF-8 character set.

Author: VK2ETA

src/javapskmail/Arq.java

@@ -1037,7 +1037,13 @@ public static String checksum(String intext) {
             0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
             0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040,};
 
-        byte[] bytes = intext.getBytes();
+        //byte[] bytes = intext.getBytes();
+        byte[] bytes;
+        try {
+            bytes = intext.getBytes("UTF-8");
+        } catch (java.io.UnsupportedEncodingException e) {
+            bytes = intext.getBytes();
+        }
         int crc = 0x0000;
         for (byte b : bytes) {
             crc = (crc >>> 8) ^ table[(crc ^ b) & 0xff];

src/javapskmail/Main.java

@@ -34,9 +34,9 @@
 public class Main {
 
     //VK2ETA: Based on "jpskmail 1.7.b";
-    static String version = "3.1.8";
+    static String version = "3.1.8.1";
     static String application = "jPskmail " + version;// Used to preset an empty status
-    static String versionDate = "20230825";
+    static String versionDate = "20230826";
     static String host = "localhost";
     static int port = 7322; //ARQ IP port
     static String xmlPort = "7362"; //XML IP port
@@ -1100,7 +1100,7 @@ public static void main(String[] args) throws InterruptedException {
                                             scall = cleanCallForAprs(scall);
                                             if (scall.length() > 0) {
                                                 //Looks like a valid call sign
-                                                byte[] cmps = binfo.substring(0, 11).getBytes();
+                                                byte[] cmps = binfo.substring(0, 11).getBytes("UTF-8");
                                                 int flg = cmps[0] - 32;
                                                 int latdegrees = cmps[1] - 32;
                                                 String s_latdegrees = String.format("%02d", latdegrees);

src/javapskmail/RxBlock.java

@@ -235,7 +235,7 @@ private String analyze(String inString) throws IOException  {
             BlockCRCwithPW = checksum(checkstring + Main.accessPassword);
        }
         if (BlockCRC.equals(crc)){
-           valid =true;
+           valid = true;
         }
         if (BlockCRCwithPW.equals(crc)) {
             validWithPW = true;
@@ -419,7 +419,13 @@ public String checksum(String intext) {
         };
 
 
-        byte[] bytes = intext.getBytes();
+        //byte[] bytes = intext.getBytes();
+        byte[] bytes;
+        try {
+            bytes = intext.getBytes("UTF-8");
+        } catch (java.io.UnsupportedEncodingException e) {
+            bytes = intext.getBytes();
+        }
         int crc1 = 0x0000;
         for (byte b : bytes) {
             crc1 = (crc1 >>> 8) ^ table[(crc1 ^ b) & 0xff];

src/javapskmail/Session.java

@@ -2486,6 +2486,18 @@ public boolean TransactionsExists() {
     public void SetBlocklength(int NewBlocklength) {
         Blocklength = NewBlocklength;
     }
+    
+    //UTF strings handling
+    private int lengthCodepoints(String s) {
+        return s.codePointCount(0, s.length());
+    }
+
+    private static String substringCodepoint(String s, int startCodepoint, int numCodepoints) {
+        int startIndex = s.offsetByCodePoints(0, startCodepoint);
+        int endIndex = s.offsetByCodePoints(startIndex, numCodepoints);
+        return s.substring(startIndex, endIndex);
+    }
+
 
     public String doTXbuffer() {
 
@@ -2556,15 +2568,19 @@ public String doTXbuffer() {
                 Blocklength = Maxblocklength;
             }
             double bl = Math.pow(2, Blocklength);
-            int queuelen = Main.txText.length();
+            //UTF-8 Handling. Use codepoints instead of raw string length 
+            //int queuelen = Main.txText.length();
+            int queuelen = lengthCodepoints(Main.txText);
 
             if (queuelen > 0) {
                 if (queuelen <= (int) bl) {
                     newstring = Main.txText;
                     Main.txText = "";
                 } else {
-                    newstring = Main.txText.substring(0, (int) bl);
-                    Main.txText = Main.txText.substring((int) bl);
+                    //newstring = Main.txText.substring(0, (int) bl);
+                    newstring = substringCodepoint(Main.txText, 0, (int) bl);
+                    //Main.txText = Main.txText.substring((int) bl);
+                    Main.txText = substringCodepoint(Main.txText, (int) bl, queuelen - (int) bl);
                 }
 
 //            lastqueued += 1;