Unicode characters in log and map bubble comments

Author: sh123

codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsDataPositionReport.java

@@ -113,7 +113,7 @@ private byte[] generateCompressedInfo(Position position) {
         } else {
             buffer.put(" sT".getBytes());
         }
-        buffer.put(position.comment.getBytes());
+        buffer.put(position.comment.getBytes(StandardCharsets.UTF_8));
         // return
         buffer.flip();
         byte [] binaryInfo = new byte[buffer.remaining()];
@@ -135,7 +135,7 @@ private byte[] generateUncompressedInfo(Position position) {
             buffer.put(String.format(Locale.US, "/A=%06d",
                     UnitTools.metersToFeet(position.altitudeMeters)).getBytes());
         }
-        buffer.put(position.comment.getBytes());
+        buffer.put(position.comment.getBytes(StandardCharsets.UTF_8));
         // return
         buffer.flip();
         byte [] binaryInfo = new byte[buffer.remaining()];

codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsDataPositionReportMicE.java

@@ -109,7 +109,7 @@ public void fromPosition(Position position) {
         }
 
         // comment
-        buffer.put(position.comment.getBytes());
+        buffer.put(position.comment.getBytes(StandardCharsets.UTF_8));
 
         // return
         buffer.flip();

codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsDataTextMessage.java

@@ -114,8 +114,8 @@ public void fromBinary(String srcCallsign, String dstCallsign, String digipath,
     @Override
     public byte[] toBinary() {
         return (ackId > 0)
-                ? String.format(Locale.US, ":%-9s:%s{%d", dstCallsign, textMessage, ackId).getBytes()
-                : String.format(":%-9s:%s", dstCallsign, textMessage).getBytes();
+                ? String.format(Locale.US, ":%-9s:%s{%d", dstCallsign, textMessage, ackId).getBytes(StandardCharsets.UTF_8)
+                : String.format(":%-9s:%s", dstCallsign, textMessage).getBytes(StandardCharsets.UTF_8);
     }
 
     @Override

codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsThirdParty.java

@@ -4,6 +4,8 @@
 import com.radio.codec2talkie.protocol.message.TextMessage;
 import com.radio.codec2talkie.protocol.position.Position;
 
+import java.nio.charset.StandardCharsets;
+
 public class AprsThirdParty implements AprsData {
 
     private AprsData _aprsData;
@@ -45,7 +47,7 @@ public void fromBinary(String srcCallsign, String dstCallsign, String digipath,
         AprsDataType aprsDataType = new AprsDataType(data.data.charAt(0));
         _aprsData = AprsDataFactory.create(aprsDataType);
         if (_aprsData == null) return;
-        _aprsData.fromBinary(data.src, data.dst, data.rawDigipath, data.data.getBytes());
+        _aprsData.fromBinary(data.src, data.dst, data.rawDigipath, data.data.getBytes(StandardCharsets.UTF_8));
     }
 
     @Override

codec2talkie/src/main/java/com/radio/codec2talkie/protocol/ax25/AX25Packet.java

@@ -4,7 +4,6 @@
 
 import com.radio.codec2talkie.protocol.aprs.tools.AprsIsData;
 import com.radio.codec2talkie.tools.DebugTools;
-import com.radio.codec2talkie.tools.TextTools;
 
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
@@ -167,7 +166,7 @@ public boolean digiRepeat() {
             if (rptCallsign.isValid) {
                 if (!isDigiRepeated && rptCallsign.digiRepeat()) {
                     isDigiRepeated = true;
-                    buf.append(rptCallsign.toString());
+                    buf.append(rptCallsign);
                 } else {
                     buf.append(digiPaths[i]);
                 }
@@ -187,7 +186,8 @@ public String toString() {
             path = "," + path;
         String info = DebugTools.bytesToDebugString(rawData);
         if (!isAudio) {
-            info = DebugTools.bytesToDebugString(TextTools.stripNulls(rawData));
+            //info = DebugTools.bytesToDebugString(TextTools.stripNulls(rawData));
+            info = new String(rawData);
         }
         return String.format("%s>%s%s:%s", src, dst, path, info);
     }