Remove carriage return

sh123 · sh123 · commit fa0da5883da1 · 2025-04-19T16:30:17.000+03:00
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/tools/TextTools.java b/codec2talkie/src/main/java/com/radio/codec2talkie/tools/TextTools.java
@@ -45,15 +45,14 @@ public static String getString(ByteBuffer byteBuffer) {
             while (byteBuffer.hasRemaining()) {
                 byte b = byteBuffer.get();
                 char c = charset.decode(ByteBuffer.wrap(new byte[]{b})).toString().charAt(0);
-                if (c == '\r') continue;
                 if (c == '\n') {
                     break;
                 }
                 result.append(c);
             }
             byteBuffer.compact();
         }
-        return result.toString();
+        return result.toString().replaceAll("[\\r\\n]+$", "");
     }
 
     public static byte[] hexStringToByteArray(String s) {

Original file line number	Diff line number	Diff line change
`@@ -45,15 +45,14 @@ public static String getString(ByteBuffer byteBuffer) {`
`45`	`45`	`while (byteBuffer.hasRemaining()) {`
`46`	`46`	`byte b = byteBuffer.get();`
`47`	`47`	`char c = charset.decode(ByteBuffer.wrap(new byte[]{b})).toString().charAt(0);`
`48`		`- if (c == '\r') continue;`
`49`	`48`	`if (c == '\n') {`
`50`	`49`	`break;`
`51`	`50`	`}`
`52`	`51`	`result.append(c);`
`53`	`52`	`}`
`54`	`53`	`byteBuffer.compact();`
`55`	`54`	`}`
`56`		`- return result.toString();`
	`55`	`+ return result.toString().replaceAll("[\\r\\n]+$", "");`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`public static byte[] hexStringToByteArray(String s) {`